summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorAndrew Ruder <andy@aeruder.net>2007-04-27 04:58:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-27 05:43:10 (GMT)
commit2bc060cc6fce9f51240bf35803a5690dd1813c7c (patch)
treeeef0f0ef71f0da006b9d9286590e6e8b02819589 /Documentation/git-fmt-merge-msg.txt
parent42905294de0c1885f5636319c4790f184d767875 (diff)
downloadgit-2bc060cc6fce9f51240bf35803a5690dd1813c7c.zip
git-2bc060cc6fce9f51240bf35803a5690dd1813c7c.tar.gz
git-2bc060cc6fce9f51240bf35803a5690dd1813c7c.tar.bz2
Update git-fmt-merge documentation
Documentation/git-fmt-merge-msg.txt: --summary to list commit summaries on merge --no-summary --file to take merged objects from a file. Configuration option merge.summary Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt25
1 files changed, 24 insertions, 1 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index a70eb39..e560b30 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -8,7 +8,8 @@ git-fmt-merge-msg - Produce a merge commit message
SYNOPSIS
--------
-'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD
+git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
+git-fmt-merge-msg [--summary | --no-summray] -F <file>
DESCRIPTION
-----------
@@ -19,6 +20,28 @@ passed as the '<merge-message>' argument of `git-merge`.
This script is intended mostly for internal use by scripts
automatically invoking `git-merge`.
+OPTIONS
+-------
+
+--summary::
+ In addition to branch names, populate the log message with
+ one-line descriptions from the actual commits that are being
+ merged.
+
+--no-summary::
+ Do not list one-line descriptions from the actual commits being
+ merged.
+
+--file <file>, -F <file>::
+ Take the list of merged objects from <file> instead of
+ stdin.
+
+CONFIGURATION
+-------------
+
+merge.summary::
+ Whether to include summaries of merged commits in newly
+ merge commit messages. False by default.
SEE ALSO
--------