mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
a6080a0a44
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.3 KiB
Text
62 lines
1.3 KiB
Text
git-fmt-merge-msg(1)
|
|
====================
|
|
|
|
NAME
|
|
----
|
|
git-fmt-merge-msg - Produce a merge commit message
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
|
|
git-fmt-merge-msg [--summary | --no-summray] -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 script is intended mostly for internal use by scripts
|
|
automatically invoking `git-merge`.
|
|
|
|
OPTIONS
|
|
-------
|
|
|
|
--summary::
|
|
In addition to branch names, populate the log message with
|
|
one-line descriptions from the actual commits that are being
|
|
merged.
|
|
|
|
--no-summary::
|
|
Do not list one-line descriptions from the actual commits being
|
|
merged.
|
|
|
|
--file <file>, -F <file>::
|
|
Take the list of merged objects from <file> instead of
|
|
stdin.
|
|
|
|
CONFIGURATION
|
|
-------------
|
|
|
|
merge.summary::
|
|
Whether to include summaries of merged commits in newly
|
|
merge commit messages. False by default.
|
|
|
|
SEE ALSO
|
|
--------
|
|
gitlink:git-merge[1]
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|