diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 01:23:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-13 02:28:18 (GMT) |
| commit | d8abe148bece83f6c3e5ebe6075aef236322ed74 (patch) | |
| tree | de668ac4309de778b211bd4834a5cc14090b6e6c /contrib | |
| parent | f5a84c372f8f044899dde91f1a415d2bf963377e (diff) | |
| download | git-d8abe148bece83f6c3e5ebe6075aef236322ed74.zip git-d8abe148bece83f6c3e5ebe6075aef236322ed74.tar.gz git-d8abe148bece83f6c3e5ebe6075aef236322ed74.tar.bz2 | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4d81963..0f54cfd 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -779,7 +779,7 @@ _git_merge () ;; --*) __gitcomp " - --no-commit --no-summary --squash --strategy + --no-commit --no-stat --squash --strategy " return esac |