diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:23 (GMT) |
| commit | 7e46f27fa627c0f9f6f547bef53e5aa2de52dec5 (patch) | |
| tree | f34a803234c9560ed7e28f3459c948cd11b3f01b /Documentation | |
| parent | 06629901444888e5fa491c5f5f24ff03686af9a9 (diff) | |
| parent | db9bb280ed7df7858a2de5d1d0334114dd837be0 (diff) | |
| download | git-7e46f27fa627c0f9f6f547bef53e5aa2de52dec5.zip git-7e46f27fa627c0f9f6f547bef53e5aa2de52dec5.tar.gz git-7e46f27fa627c0f9f6f547bef53e5aa2de52dec5.tar.bz2 | |
Merge branch 'pt/pull-ff-vs-merge-ff' into maint
The pull.ff configuration was supposed to override the merge.ff
configuration, but it didn't.
* pt/pull-ff-vs-merge-ff:
pull: parse pull.ff as a bool or string
pull: make pull.ff=true override merge.ff
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9ccabb4..f4fb31a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2033,7 +2033,7 @@ pull.ff:: 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). + command line). This setting overrides `merge.ff` when pulling. pull.rebase:: When true, rebase branches on top of the fetched branch, instead |