From 51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Wed, 23 May 2007 23:01:29 +0200 Subject: Add a configuration option to control diffstat after merge The diffstat can be controlled either with command-line options (--summary|--no-summary) or with merge.diffstat. The default is left as it was: diffstat is active by default. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- git-pull.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'git-pull.sh') diff --git a/git-pull.sh b/git-pull.sh index a3665d7751..ba0ca079e2 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) -- cgit v1.2.1