Move split_cmdline() to alias.c

[git.git] / Documentation / merge-config.txt

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index cc815cc214f3d860dd0f700b7ed3a1af7684f933..48ce747cf4dad592d642735856eb156e93d6cf30 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,7 +1,16 @@
-merge.summary::
+merge.stat::
+       Whether to print the diffstat berween ORIG_HEAD and merge result
+       at the end of the merge.  True by default.
+
+merge.log::
        Whether to include summaries of merged commits in newly created
        merge commit messages. False by default.
 
+merge.renameLimit::
+       The number of files to consider when performing rename detection
+       during a merge; if not specified, defaults to the value of
+       diff.renameLimit.
+
 merge.tool::
        Controls which merge resolution program is used by
        linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",