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/merge-options.txt | |
| parent | f5a84c372f8f044899dde91f1a415d2bf963377e (diff) | |
| download | git-d8abe148bece83f6c3e5ebe6075aef236322ed74.tar.gz | |
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/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 9f1fc82550..7904172644 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -1,10 +1,14 @@ ---summary:: +--stat:: Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.diffstat. --n, \--no-summary:: +-n, \--no-stat:: Do not show diffstat at the end of the merge. +--summary, \--no-summary:: + Synonyms to --stat and --no-stat; these are deprecated and will be + removed in the future. + --no-commit:: Perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and |