mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: introduce merge.ff configuration variable

Browse Source 
This variable gives the default setting for --ff, --no-ff or --ff-only
options of "git merge" command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-05-06 12:27:05 -07:00
parent 541d1fa85c
commit f23e8decd5
3 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/merge-config.txt
View File

@ -16,6 +16,16 @@ merge.defaultToUpstream::
to their corresponding remote tracking branches, and the tips of
these tracking branches are merged.
merge.ff::
By default, git does not create an extra merge commit when merging
a commit that is a descendant of the current commit. Instead, the
tip of the current branch is fast-forwarded. When set to `false`,
this variable tells git to create an extra merge commit in such
a case (equivalent to giving the `--no-ff` option from the command
line). When set to `only`, only such fast-forward merges are
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