diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 03:23:43 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:28:18 -0700 |
| commit | d8abe148bece83f6c3e5ebe6075aef236322ed74 (patch) | |
| tree | de668ac4309de778b211bd4834a5cc14090b6e6c /Documentation/i18n.txt | |
| parent | doc: moved merge.* config variables into separate merge-config.txt (diff) | |
| download | tgif-d8abe148bece83f6c3e5ebe6075aef236322ed74.tar.xz | |
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 'Documentation/i18n.txt')
0 files changed, 0 insertions, 0 deletions