merge, pull: add '--(no-)log' command line option

[~andy/git] / Documentation / merge-options.txt

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index d4af5e2664d3e26c9d360a9b8b59fdc7cc878db6..f37a77648934fcd8c707cfc1446ef5425cc7fa79 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -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