]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-fmt-merge-msg.txt
Git 2.2.2
[thirdparty/git.git] / Documentation / git-fmt-merge-msg.txt
CommitLineData
3c64314c
PB
1git-fmt-merge-msg(1)
2====================
3
4NAME
5----
6git-fmt-merge-msg - Produce a merge commit message
7
8
9SYNOPSIS
10--------
e448ff87 11[verse]
96e9420c
RR
12'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] <$GIT_DIR/FETCH_HEAD
13'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
3c64314c
PB
14
15DESCRIPTION
16-----------
17Takes the list of merged objects on stdin and produces a suitable
18commit message to be used for the merge commit, usually to be
0b444cdb 19passed as the '<merge-message>' argument of 'git merge'.
3c64314c 20
0f8a02c6
JN
21This command is intended mostly for internal use by scripts
22automatically invoking 'git merge'.
3c64314c 23
2bc060cc
AR
24OPTIONS
25-------
26
96e9420c 27--log[=<n>]::
2bc060cc
AR
28 In addition to branch names, populate the log message with
29 one-line descriptions from the actual commits that are being
96e9420c
RR
30 merged. At most <n> commits from each merge parent will be
31 used (20 if <n> is omitted). This overrides the `merge.log`
32 configuration variable.
2bc060cc 33
6cd9cfef 34--no-log::
2bc060cc
AR
35 Do not list one-line descriptions from the actual commits being
36 merged.
37
0460ed2c 38--[no-]summary::
6cd9cfef
SG
39 Synonyms to --log and --no-log; these are deprecated and will be
40 removed in the future.
41
2102440c
JN
42-m <message>::
43--message <message>::
44 Use <message> instead of the branch names for the first line
45 of the log message. For use with `--log`.
46
3240240f
SB
47-F <file>::
48--file <file>::
2bc060cc
AR
49 Take the list of merged objects from <file> instead of
50 stdin.
51
52CONFIGURATION
53-------------
54
8c80ff36
JH
55merge.branchdesc::
56 In addition to branch names, populate the log message with
57 the branch description text associated with them. Defaults
58 to false.
59
6cd9cfef 60merge.log::
bda3b8ff
RR
61 In addition to branch names, populate the log message with at
62 most the specified number of one-line descriptions from the
63 actual commits that are being merged. Defaults to false, and
469bfc96 64 true is a synonym for 20.
3c64314c 65
6cd9cfef
SG
66merge.summary::
67 Synonym to `merge.log`; this is deprecated and will be removed in
68 the future.
69
3c64314c
PB
70SEE ALSO
71--------
5162e697 72linkgit:git-merge[1]
3c64314c 73
3c64314c
PB
74GIT
75---
9e1f0a85 76Part of the linkgit:git[1] suite