]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/git-fmt-merge-msg.txt
use 'commit-ish' instead of 'committish'
[thirdparty/git.git] / Documentation / git-fmt-merge-msg.txt
1 git-fmt-merge-msg(1)
2 ====================
3
4 NAME
5 ----
6 git-fmt-merge-msg - Produce a merge commit message
7
8
9 SYNOPSIS
10 --------
11 [verse]
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>
14
15 DESCRIPTION
16 -----------
17 Takes the list of merged objects on stdin and produces a suitable
18 commit message to be used for the merge commit, usually to be
19 passed as the '<merge-message>' argument of 'git merge'.
20
21 This command is intended mostly for internal use by scripts
22 automatically invoking 'git merge'.
23
24 OPTIONS
25 -------
26
27 --log[=<n>]::
28 In addition to branch names, populate the log message with
29 one-line descriptions from the actual commits that are being
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.
33
34 --no-log::
35 Do not list one-line descriptions from the actual commits being
36 merged.
37
38 --[no-]summary::
39 Synonyms to --log and --no-log; these are deprecated and will be
40 removed in the future.
41
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
47 -F <file>::
48 --file <file>::
49 Take the list of merged objects from <file> instead of
50 stdin.
51
52 CONFIGURATION
53 -------------
54
55 merge.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
60 merge.log::
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
64 true is a synonym for 20.
65
66 merge.summary::
67 Synonym to `merge.log`; this is deprecated and will be removed in
68 the future.
69
70 SEE ALSO
71 --------
72 linkgit:git-merge[1]
73
74 GIT
75 ---
76 Part of the linkgit:git[1] suite