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:

committed by
Junio C Hamano

parent
f5a84c372f
commit
d8abe148be
@ -779,7 +779,7 @@ _git_merge ()
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "
|
||||
--no-commit --no-summary --squash --strategy
|
||||
--no-commit --no-stat --squash --strategy
|
||||
"
|
||||
return
|
||||
esac
|
||||
|
Reference in New Issue
Block a user