Merge 1.5.5.4 in

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 79041726447d7bb5d0671c78e0378c53368aa238..f37a77648934fcd8c707cfc1446ef5425cc7fa79 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,6 +1,6 @@
 --stat::
        Show a diffstat at the end of the merge. The diffstat is also
-       controlled by the configuration option merge.diffstat.
+       controlled by the configuration option merge.stat.
 
 -n, \--no-stat::
        Do not show diffstat at the end of the merge.
@@ -9,6 +9,15 @@
        Synonyms to --stat and --no-stat; these are deprecated and will be
        removed in the future.
 
+--log::
+       In addition to branch names, populate the log message with
+       one-line descriptions from the actual commits that are being
+       merged.
+
+--no-log::
+       Do not list one-line descriptions from the actual commits being
+       merged.
+
 --no-commit::
        Perform the merge but pretend the merge failed and do
        not autocommit, to give the user a chance to inspect and