diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 12:27:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 15:12:30 -0700 |
| commit | f23e8decd544c8f81b40c98211f6cb028fa70cdc (patch) | |
| tree | 46722262fd27b289b619373a331794397f481c1c /Documentation/merge-config.txt | |
| parent | 541d1fa85ca4741e8b6db281f3d788dcfc423bdc (diff) | |
| download | git-f23e8decd544c8f81b40c98211f6cb028fa70cdc.tar.gz git-f23e8decd544c8f81b40c98211f6cb028fa70cdc.tar.xz | |
merge: introduce merge.ff configuration variable
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>
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 8920258ba..861bd6f55 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -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 |