summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
blob: f04a9ff0e0299bdb6f33d10f5674cc19dc2777f7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
git-fmt-merge-msg(1)
====================
 
NAME
----
git-fmt-merge-msg - Produce a merge commit message
 
 
SYNOPSIS
--------
[verse]
'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] <$GIT_DIR/FETCH_HEAD
'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
 
DESCRIPTION
-----------
Takes the list of merged objects on stdin and produces a suitable
commit message to be used for the merge commit, usually to be
passed as the '<merge-message>' argument of 'git merge'.
 
This command is intended mostly for internal use by scripts
automatically invoking 'git merge'.
 
OPTIONS
-------
 
--log[=<n>]::
	In addition to branch names, populate the log message with
	one-line descriptions from the actual commits that are being
	merged.  At most <n> commits from each merge parent will be
	used (20 if <n> is omitted).  This overrides the `merge.log`
	configuration variable.
 
--no-log::
	Do not list one-line descriptions from the actual commits being
	merged.
 
--summary::
--no-summary::
	Synonyms to --log and --no-log; these are deprecated and will be
	removed in the future.
 
-m <message>::
--message <message>::
	Use <message> instead of the branch names for the first line
	of the log message.  For use with `--log`.
 
-F <file>::
--file <file>::
	Take the list of merged objects from <file> instead of
	stdin.
 
CONFIGURATION
-------------
 
merge.log::
	Whether to include summaries of merged commits in newly
	merge commit messages. False by default.
 
merge.summary::
	Synonym to `merge.log`; this is deprecated and will be removed in
	the future.
 
SEE ALSO
--------
linkgit:git-merge[1]
 
 
Author
------
Written by Junio C Hamano <gitster@pobox.com>
 
Documentation
--------------
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
 
GIT
---
Part of the linkgit:git[1] suite