diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2007-05-23 21:01:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-25 04:37:08 (GMT) |
| commit | 51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 (patch) | |
| tree | d64d7dea3213b1c474e39d623b86acb39cbb9dc0 /Documentation | |
| parent | 18bece43675ea0dc9022a7868865e02808b7af7f (diff) | |
| download | git-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')
| -rw-r--r-- | Documentation/git-merge.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 9c08efa..912ef29 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -9,7 +9,7 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [verse] -'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]... +'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]... [-m <msg>] <remote> <remote>... DESCRIPTION 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. |