From: "Alex Riesen" <raa.lkml@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <junkio@cox.net>
Subject: [PATCH] disable merge summaries if they are disabled
Date: Wed, 23 May 2007 17:28:07 +0200 [thread overview]
Message-ID: <81b0412b0705230828s7fcdd836gf3bb92000d8ebd79@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 136 bytes --]
Otherwise the merge.summary option has no visible effect.
---
git-merge.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
[-- Attachment #2: 0001-disable-merge-summaries-if-the-are-disabled.txt --]
[-- Type: text/plain, Size: 617 bytes --]
From 20ef81ca3b30a4c96906b3512ca1b52d2bec3698 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 23 May 2007 15:52:16 +0200
Subject: [PATCH] disable merge summaries if they are disabled
---
git-merge.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 351676f..7fbe03a 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -121,6 +121,7 @@ merge_name () {
case "$#" in 0) usage ;; esac
have_message=
+test $(git-config merge.summary) = false && no_summary=t
while case "$#" in 0) break ;; esac
do
case "$1" in
--
1.5.2.784.gb18c
next reply other threads:[~2007-05-23 15:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-23 15:28 Alex Riesen [this message]
2007-05-23 16:03 ` [PATCH] disable merge summaries if they are disabled Alex Riesen
2007-05-23 18:22 ` Junio C Hamano
2007-05-23 19:58 ` Alex Riesen
2007-05-23 20:02 ` [PATCH] Add a configuration option to control diffstat after merge Alex Riesen
2007-05-23 20:18 ` Junio C Hamano
2007-05-23 20:43 ` Alex Riesen
2007-05-23 21:01 ` Alex Riesen
2007-05-23 20:03 ` [PATCH] disable merge summaries if they are disabled Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b0412b0705230828s7fcdd836gf3bb92000d8ebd79@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).