From: Alex Riesen Date: Wed, 23 May 2007 16:03:54 GMT Subject: Re: [PATCH] disable merge summaries if they are disabled Message-ID: <81b0412b0705230903j197c2b8ewfbf81002c0e6b5be@mail.gmail.com> In-Reply-To: <81b0412b0705230828s7fcdd836gf3bb92000d8ebd79@mail.gmail.com> Otherwise the merge.summary option has no visible effect. Signed-off-by: Alex Riesen --- Forgot the sign-off. git-merge.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) From 20ef81ca3b30a4c96906b3512ca1b52d2bec3698 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Wed, 23 May 2007 15:52:16 +0200 Subject: [PATCH] disable merge summaries if they are disabled Signed-off-by: Alex Riesen --- 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.787.g56770