diff options
| author |  David Aguilar <davvid@gmail.com> | 2014-01-15 15:18:38 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-01-15 16:01:06 -0800 |
| commit | b814da891e8261b909fc5d9fb07b4e8b13989c2d (patch) | |
| tree | 20bdca746012df5441dbfc5bdaab9a75e9649c7d /Documentation/config.txt | |
| parent | Git 1.8.5.3 (diff) | |
| download | tgif-b814da891e8261b909fc5d9fb07b4e8b13989c2d.tar.xz | |
pull: add pull.ff configuration
Add a `pull.ff` configuration option that is analogous
to the `merge.ff` option.
This allows us to control the fast-forward behavior for
pull-initiated merges only.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ab26963d61..7443f15bf4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1877,6 +1877,16 @@ pretty.<name>:: Note that an alias with the same name as a built-in format will be silently ignored. +pull.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). + pull.rebase:: When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote when "git |