merge, pull: introduce '--(no-)stat' option

This option has the same effect as '--(no-)summary' (i.e. whether to
show a diffsat at the end of the merge or not), and it is consistent
with the '--stat' option of other git commands.

Documentation, tests, and bash completion are updaed accordingly, and the
old --summary option is marked as being deprected.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor
2008-04-06 03:23:43 +02:00
committed by Junio C Hamano
parent f5a84c372f
commit d8abe148be
6 changed files with 40 additions and 21 deletions

View File

@ -779,7 +779,7 @@ _git_merge ()
;;
--*)
__gitcomp "
--no-commit --no-summary --squash --strategy
--no-commit --no-stat --squash --strategy
"
return
esac