diff options
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index cc815cc214..6d0a7971c2 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,3 +1,7 @@ +merge.stat:: + Whether to print the diffstat berween ORIG_HEAD and merge result + at the end of the merge. True by default. + merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. |