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>
Andrew Ruder committed
Apr 26, 2007 at 23:58 UTC
2bc060cc6fce9f51240bf35803a5690dd1813c7c
1 file changed
+24
-1
Documentation/git-fmt-merge-msg.txt
+24
-1
@@ -8,7 +8,8 @@ git-fmt-merge-msg - Produce a merge commit message
8
9
SYNOPSIS
10
--------
11
-'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD
11
+git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
12
+git-fmt-merge-msg [--summary | --no-summray] -F <file>
13
14
DESCRIPTION
15
-----------
@@ -19,6 +20,28 @@ passed as the '<merge-message>' argument of `git-merge`.
20
This script is intended mostly for internal use by scripts
21
automatically invoking `git-merge`.
22
23
+OPTIONS
24
+-------
25
+
26
+--summary::
27
+ In addition to branch names, populate the log message with
28
+ one-line descriptions from the actual commits that are being
29
+ merged.
30
+
31
+--no-summary::
32
+ Do not list one-line descriptions from the actual commits being
33
+ merged.
34
+
35
+--file <file>, -F <file>::
36
+ Take the list of merged objects from <file> instead of
37
+ stdin.
38
+
39
+CONFIGURATION
40
+-------------
41
+
42
+merge.summary::
43
+ Whether to include summaries of merged commits in newly
44
+ merge commit messages. False by default.
45
46
SEE ALSO
47
--------