documentation: convert "diffcore" and "repository-layout" to man pages
[git/git.git] / Documentation / git-fmt-merge-msg.txt
... / ...
CommitLineData
1git-fmt-merge-msg(1)
2====================
3
4NAME
5----
6git-fmt-merge-msg - Produce a merge commit message
7
8
9SYNOPSIS
10--------
11[verse]
12git-fmt-merge-msg [--log | --no-log] <$GIT_DIR/FETCH_HEAD
13git-fmt-merge-msg [--log | --no-log] -F <file>
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
19passed as the '<merge-message>' argument of `git-merge`.
20
21This script is intended mostly for internal use by scripts
22automatically invoking `git-merge`.
23
24OPTIONS
25-------
26
27--log::
28 In addition to branch names, populate the log message with
29 one-line descriptions from the actual commits that are being
30 merged.
31
32--no-log::
33 Do not list one-line descriptions from the actual commits being
34 merged.
35
36--summary,--no-summary::
37 Synonyms to --log and --no-log; these are deprecated and will be
38 removed in the future.
39
40--file <file>, -F <file>::
41 Take the list of merged objects from <file> instead of
42 stdin.
43
44CONFIGURATION
45-------------
46
47merge.log::
48 Whether to include summaries of merged commits in newly
49 merge commit messages. False by default.
50
51merge.summary::
52 Synonym to `merge.log`; this is deprecated and will be removed in
53 the future.
54
55SEE ALSO
56--------
57linkgit:git-merge[1]
58
59
60Author
61------
62Written by Junio C Hamano <junkio@cox.net>
63
64Documentation
65--------------
66Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
67
68GIT
69---
70Part of the linkgit:git[7] suite