summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-04-06 01:23:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-13 02:28:18 (GMT)
commitefb779f8873e5aa36be29a4e551186c62c1b580c (patch)
treefee6f6a34142af04294bbb2ce13822bf4ccb1c13 /Documentation/merge-options.txt
parent6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 (diff)
downloadgit-efb779f8873e5aa36be29a4e551186c62c1b580c.zip
git-efb779f8873e5aa36be29a4e551186c62c1b580c.tar.gz
git-efb779f8873e5aa36be29a4e551186c62c1b580c.tar.bz2
merge, pull: add '--(no-)log' command line option
These are the command line option equivalents of the 'merge.log' config variable. The patch also updates documentation and bash completion accordingly, and adds a test. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index d4af5e2..f37a776 100644
--- 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