| commit | d8abe148bece83f6c3e5ebe6075aef236322ed74 | |
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Sun, 6 Apr 2008 01:23:43 +0000 (6 03:23 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Apr 2008 02:28:18 +0000 (12 19:28 -0700) | ||
| tree | de668ac4309de778b211bd4834a5cc14090b6e6c | treesnapshot (tar.gz zip) |
| parent | f5a84c372f8f044899dde91f1a415d2bf963377e | commitdiff |
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 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>