summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-05-23 21:01:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-25 04:37:08 (GMT)
commit51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 (patch)
treed64d7dea3213b1c474e39d623b86acb39cbb9dc0 /Documentation/merge-options.txt
parent18bece43675ea0dc9022a7868865e02808b7af7f (diff)
downloadgit-51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9.zip
git-51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9.tar.gz
git-51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9.tar.bz2
Add a configuration option to control diffstat after merge
The diffstat can be controlled either with command-line options (--summary|--no-summary) or with merge.diffstat. The default is left as it was: diffstat is active by default. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 182cef5..56f1d8d 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,3 +1,7 @@
+--summary::
+ Show a diffstat at the end of the merge. The diffstat is also
+ controlled by the configuration option merge.diffstat.
+
-n, \--no-summary::
Do not show diffstat at the end of the merge.