mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'sg/merge-summary-config'
Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well
This commit is contained in:
commit
c7ca4424ea
10
Documentation/fmt-merge-msg-config.txt
Normal file
10
Documentation/fmt-merge-msg-config.txt
Normal file
|
@ -0,0 +1,10 @@
|
|||
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.
|
|
@ -51,17 +51,7 @@ OPTIONS
|
|||
|
||||
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.
|
||||
include::fmt-merge-msg-config.txt[]
|
||||
|
||||
merge.summary::
|
||||
Synonym to `merge.log`; this is deprecated and will be removed in
|
||||
|
|
|
@ -26,11 +26,7 @@ merge.ff::
|
|||
allowed (equivalent to giving the `--ff-only` option from the
|
||||
command line).
|
||||
|
||||
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.
|
||||
include::fmt-merge-msg-config.txt[]
|
||||
|
||||
merge.renameLimit::
|
||||
The number of files to consider when performing rename detection
|
||||
|
|
Loading…
Reference in a new issue