diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2007-05-23 23:01:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-24 21:37:08 -0700 |
| commit | 51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 (patch) | |
| tree | d64d7dea3213b1c474e39d623b86acb39cbb9dc0 /git-pull.sh | |
| parent | 18bece43675ea0dc9022a7868865e02808b7af7f (diff) | |
| download | git-51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9.tar.gz git-51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9.tar.xz | |
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 <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index a3665d775..ba0ca079e 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) |