projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f5a84c3) | patch
merge, pull: introduce '--(no-)stat' option
authorSZEDER Gábor <szeder@ira.uka.de>
Sun, 6 Apr 2008 01:23:43 +0000 (03:23 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Apr 2008 02:28:18 +0000 (19:28 -0700)
commitd8abe148bece83f6c3e5ebe6075aef236322ed74
treede668ac4309de778b211bd4834a5cc14090b6e6ctree | snapshot
parentf5a84c372f8f044899dde91f1a415d2bf963377ecommit | diff
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>
Documentation/git-merge.txt diff | blob | blame | history
Documentation/merge-options.txt diff | blob | blame | history
contrib/completion/git-completion.bash diff | blob | blame | history
git-merge.sh diff | blob | blame | history
git-pull.sh diff | blob | blame | history
t/t7600-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.