Just for completeness. Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx> --- git-merge.sh | 5 ++++- git-pull.sh | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-)
From 48a6a3db1a21f1ce3db516987b167a9d6b2143a7 Mon Sep 17 00:00:00 2001 From: Alex Riesen <raa.lkml@xxxxxxxxx> Date: Wed, 23 May 2007 17:36:00 +0200 Subject: [PATCH] Add an option to override the configured setting for merge summaries Just for completeness. Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx> --- git-merge.sh | 5 ++++- git-pull.sh | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/git-merge.sh b/git-merge.sh index 7fbe03a..e79cc76 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+' +USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+' SUBDIRECTORY_OK=Yes . git-sh-setup @@ -128,6 +128,9 @@ do -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ --no-summa|--no-summar|--no-summary) no_summary=t ;; + --summary) + no_summary= + ;; --sq|--squ|--squa|--squas|--squash) squash=t no_commit=t ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) diff --git a/git-pull.sh b/git-pull.sh index a3665d7..ba0ca07 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -22,6 +22,9 @@ do -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ --no-summa|--no-summar|--no-summary) no_summary=-n ;; + --summary) + no_summary=$1 + ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) no_commit=--no-commit ;; --sq|--squ|--squa|--squas|--squash) -- 1.5.2.787.g56770
