Google Git
Sign in
chromium / external / gitster / git-htmldocs / 1123f30049dc3e8a293e88e621cc52971dc415e7 / . / git-fmt-merge-msg.txt
blob: a585dbe898171ddb8a205cc5a898d695540f80a6 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1git-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:55[diff] [blame]11[verse]
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]12'git fmt-merge-msg' [--log | --no-log] <$GIT_DIR/FETCH_HEAD
13'git fmt-merge-msg' [--log | --no-log] -F <file>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]19passed as the '<merge-message>' argument of 'git merge'.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]20
Junio C Hamanoc0e55e72009-10-10 00:56:29[diff] [blame]21This command is intended mostly for internal use by scripts
22automatically invoking 'git merge'.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]23
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]24OPTIONS
25-------
26
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]27--log::
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]28In addition to branch names, populate the log message with
29one-line descriptions from the actual commits that are being
30merged.
31
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]32--no-log::
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]33Do not list one-line descriptions from the actual commits being
34merged.
35
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]36--summary::
37--no-summary::
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]38Synonyms to --log and --no-log; these are deprecated and will be
39removed in the future.
40
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]41-F <file>::
42--file <file>::
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]43Take the list of merged objects from <file> instead of
44stdin.
45
46CONFIGURATION
47-------------
48
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]49merge.log::
Junio C Hamano9882a522007-04-27 08:22:22[diff] [blame]50Whether to include summaries of merged commits in newly
51merge commit messages. False by default.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]52
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]53merge.summary::
54Synonym to `merge.log`; this is deprecated and will be removed in
55the future.
56
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]57SEE ALSO
58--------
Junio C Hamano35738e82008-01-07 07:55:46[diff] [blame]59linkgit:git-merge[1]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]60
61
62Author
63------
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]64Written by Junio C Hamano <gitster@pobox.com>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]65
66Documentation
67--------------
68Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
69
70GIT
71---
Junio C Hamanof7c042d2008-06-06 22:50:53[diff] [blame]72Part of the linkgit:git[1] suite