blob: 6f28812f38defec0047f9c47ca554231a6adfd8e [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-fmt-merge-msg(1)
2====================
3
4NAME
5----
6git-fmt-merge-msg - Produce a merge commit message
7
8
9SYNOPSIS
10--------
Junio C Hamanoa9b8d242007-05-19 04:51:5511[verse]
Junio C Hamanoe872a1c2022-01-05 22:15:1312'git fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
Junio C Hamano3b4609d2010-09-30 00:04:3413'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
Junio C Hamano1a4e8412005-12-27 08:17:2314
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
Junio C Hamano1aa40d22010-01-21 17:46:4319passed as the '<merge-message>' argument of 'git merge'.
Junio C Hamano1a4e8412005-12-27 08:17:2320
Junio C Hamanoc0e55e72009-10-10 00:56:2921This command is intended mostly for internal use by scripts
22automatically invoking 'git merge'.
Junio C Hamano1a4e8412005-12-27 08:17:2323
Junio C Hamano9882a522007-04-27 08:22:2224OPTIONS
25-------
26
Junio C Hamano3b4609d2010-09-30 00:04:3427--log[=<n>]::
Junio C Hamano9882a522007-04-27 08:22:2228In addition to branch names, populate the log message with
29one-line descriptions from the actual commits that are being
Junio C Hamano3b4609d2010-09-30 00:04:3430merged. At most <n> commits from each merge parent will be
31used (20 if <n> is omitted). This overrides the `merge.log`
32configuration variable.
Junio C Hamano9882a522007-04-27 08:22:2233
Junio C Hamano6d76d612008-05-09 05:46:0834--no-log::
Junio C Hamano9882a522007-04-27 08:22:2235Do not list one-line descriptions from the actual commits being
36merged.
37
Junio C Hamano3d1b5a12013-05-17 23:34:0238--[no-]summary::
Junio C Hamano6d76d612008-05-09 05:46:0839Synonyms to --log and --no-log; these are deprecated and will be
40removed in the future.
41
Junio C Hamano2db3e752010-09-03 21:33:0642-m <message>::
43--message <message>::
44Use <message> instead of the branch names for the first line
45of the log message. For use with `--log`.
46
Junio C Hamanoe872a1c2022-01-05 22:15:1347--into-name <branch>::
48Prepare the merge message as if merging to the branch `<branch>`,
49instead of the name of the real branch to which the merge is made.
50
Junio C Hamanoeb415992008-06-08 22:49:4751-F <file>::
52--file <file>::
Junio C Hamano9882a522007-04-27 08:22:2253Take the list of merged objects from <file> instead of
54stdin.
55
56CONFIGURATION
57-------------
Junio C Hamano06ce83b2018-11-13 14:06:1258include::config/fmt-merge-msg.txt[]
Junio C Hamano1a4e8412005-12-27 08:17:2359
Junio C Hamano6d76d612008-05-09 05:46:0860merge.summary::
61Synonym to `merge.log`; this is deprecated and will be removed in
62the future.
63
Junio C Hamanob9d9d902018-05-23 07:07:4264EXAMPLES
65--------
Junio C Hamanodaf0aae2015-10-26 23:14:3066
Junio C Hamanof2f28b12016-10-31 21:41:5867---------
Junio C Hamanodaf0aae2015-10-26 23:14:3068$ git fetch origin master
69$ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD
Junio C Hamanof2f28b12016-10-31 21:41:5870---------
Junio C Hamanodaf0aae2015-10-26 23:14:3071
72Print a log message describing a merge of the "master" branch from
73the "origin" remote.
74
75
Junio C Hamano1a4e8412005-12-27 08:17:2376SEE ALSO
77--------
Junio C Hamano35738e82008-01-07 07:55:4678linkgit:git-merge[1]
Junio C Hamano1a4e8412005-12-27 08:17:2379
Junio C Hamano1a4e8412005-12-27 08:17:2380GIT
81---
Junio C Hamanof7c042d2008-06-06 22:50:5382Part of the linkgit:git[1] suite