mirror of
https://github.com/git/git.git
synced 2024-11-08 18:23:01 +01:00
3240240ff4
The OPTIONS section of a documentation file contains a list of the options a git command accepts. Currently there are several variants to describe the case that different options (almost) do the same in the OPTIONS section. Some are: -f, --foo:: -f|--foo:: -f | --foo:: But AsciiDoc has the special form: -f:: --foo:: This patch applies this form to the documentation of the whole git suite, and removes useless em-dash prevention, so \--foo becomes --foo. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
72 lines
1.5 KiB
Text
72 lines
1.5 KiB
Text
git-fmt-merge-msg(1)
|
|
====================
|
|
|
|
NAME
|
|
----
|
|
git-fmt-merge-msg - Produce a merge commit message
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
git-fmt-merge-msg [--log | --no-log] <$GIT_DIR/FETCH_HEAD
|
|
git-fmt-merge-msg [--log | --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 script is intended mostly for internal use by scripts
|
|
automatically invoking `git-merge`.
|
|
|
|
OPTIONS
|
|
-------
|
|
|
|
--log::
|
|
In addition to branch names, populate the log message with
|
|
one-line descriptions from the actual commits that are being
|
|
merged.
|
|
|
|
--no-log::
|
|
Do not list one-line descriptions from the actual commits being
|
|
merged.
|
|
|
|
--summary::
|
|
--no-summary::
|
|
Synonyms to --log and --no-log; these are deprecated and will be
|
|
removed in the future.
|
|
|
|
-F <file>::
|
|
--file <file>::
|
|
Take the list of merged objects from <file> instead of
|
|
stdin.
|
|
|
|
CONFIGURATION
|
|
-------------
|
|
|
|
merge.log::
|
|
Whether to include summaries of merged commits in newly
|
|
merge commit messages. False by default.
|
|
|
|
merge.summary::
|
|
Synonym to `merge.log`; this is deprecated and will be removed in
|
|
the future.
|
|
|
|
SEE ALSO
|
|
--------
|
|
linkgit: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 linkgit:git[1] suite
|