mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
0460ed2c93
White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
76 lines
1.9 KiB
Text
76 lines
1.9 KiB
Text
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.
|
|
|
|
--[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.branchdesc::
|
|
In addition to branch names, populate the log message with
|
|
the branch description text associated with them. Defaults
|
|
to false.
|
|
|
|
merge.log::
|
|
In addition to branch names, populate the log message with at
|
|
most the specified number of one-line descriptions from the
|
|
actual commits that are being merged. Defaults to false, and
|
|
true is a synonym for 20.
|
|
|
|
merge.summary::
|
|
Synonym to `merge.log`; this is deprecated and will be removed in
|
|
the future.
|
|
|
|
SEE ALSO
|
|
--------
|
|
linkgit:git-merge[1]
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|