diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 03:23:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:28:18 -0700 |
| commit | 3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 (patch) | |
| tree | e09b26d17a873a63d94e7088dff143a0af14d574 /Documentation | |
| parent | d8abe148bece83f6c3e5ebe6075aef236322ed74 (diff) | |
| download | git-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.tar.gz git-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.tar.xz | |
add 'merge.stat' config variable
This variable has the same effect, as 'merge.diffstat'.
Also mention it in the documentation.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-config.txt | 4 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index cc815cc21..6d0a7971c 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,3 +1,7 @@ +merge.stat:: + Whether to print the diffstat berween ORIG_HEAD and merge result + at the end of the merge. True by default. + merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 790417264..d4af5e266 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -1,6 +1,6 @@ --stat:: Show a diffstat at the end of the merge. The diffstat is also - controlled by the configuration option merge.diffstat. + controlled by the configuration option merge.stat. -n, \--no-stat:: Do not show diffstat at the end of the merge. |