diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-05-29 09:18:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-05-29 09:18:19 +0000 |
| commit | 591dc6ae2b927354f3011bedf81ae623d9014627 (patch) | |
| tree | fb312d421fad3f6490199fc6812d60fffa4c9ad1 /merge-options.txt | |
| parent | 36460981d4d516642ddd8ee3afd442552a28a48a (diff) | |
| download | git-htmldocs-591dc6ae2b927354f3011bedf81ae623d9014627.tar.gz | |
Autogenerated HTML docs for v1.5.2-136-g322bc
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 182cef54b..56f1d8d69 100644 --- a/merge-options.txt +++ b/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. |