diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-29 00:38:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-29 00:38:52 -0700 |
| commit | 8250465859644eee5db3c1169db689beca65a868 (patch) | |
| tree | 44825f673b9676adeed70410ceed1f043175083a /Documentation | |
| parent | Merge branch 'rr/cvsexport' (diff) | |
| parent | Add a configuration option to control diffstat after merge (diff) | |
| download | tgif-8250465859644eee5db3c1169db689beca65a868.tar.xz | |
Merge branch 'ar/mergestat'
* ar/mergestat:
Add a configuration option to control diffstat after merge
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 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 diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 182cef54be..56f1d8d69d 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. |