kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Update git-fmt-merge documentation 

Documentation/git-fmt-merge-msg.txt:
	--summary to list commit summaries on merge
	--no-summary
	--file to take merged objects from a file.
	Configuration option merge.summary

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Andrew Ruder 2007-04-26 23:58:57 -05:00 committed by Junio C Hamano
parent 42905294de
commit 2bc060cc6f
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Documentation/git-fmt-merge-msg.txt
View File

@ -8,7 +8,8 @@ git-fmt-merge-msg - Produce a merge commit message


SYNOPSIS SYNOPSIS
-------- --------
'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
git-fmt-merge-msg [--summary | --no-summray] -F <file>


DESCRIPTION DESCRIPTION
----------- -----------
@ -19,6 +20,28 @@ passed as the '<merge-message>' argument of `git-merge`.
This script is intended mostly for internal use by scripts This script is intended mostly for internal use by scripts
automatically invoking `git-merge`. 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 SEE ALSO
-------- --------