diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:11 -0800 |
| commit | 7da5fd6895af9066ad4684e333c57f4086589c2f (patch) | |
| tree | 17f5d719d315e3106cb56c60b3edf87e9976d3a0 /Documentation | |
| parent | d637d1b9a8fb765a8542e69bd2e04b3e229f663b (diff) | |
| parent | ef93e3a49c3b2b62c6c450f862ce1626bc8dab54 (diff) | |
| download | git-7da5fd6895af9066ad4684e333c57f4086589c2f.tar.gz git-7da5fd6895af9066ad4684e333c57f4086589c2f.tar.xz | |
Merge branch 'da/pull-ff-configuration'
"git pull" learned to pay attention to pull.ff configuration
variable.
* da/pull-ff-configuration:
pull: add --ff-only to the help text
pull: add pull.ff configuration
Diffstat (limited to 'Documentation')
| -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 a23392ca6..7eec74695 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1889,6 +1889,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 |