diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2007-05-23 23:01:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-24 21:37:08 -0700 |
| commit | 51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 (patch) | |
| tree | d64d7dea3213b1c474e39d623b86acb39cbb9dc0 /Documentation/git-merge.txt | |
| parent | 18bece43675ea0dc9022a7868865e02808b7af7f (diff) | |
| download | git-51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9.tar.gz | |
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/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 9c08efa53a..912ef29efc 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 |