diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:24:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:24:44 -0700 |
| commit | 22a1ae6ef2ba77a20113bbee6f706ec47e6440c5 (patch) | |
| tree | a0e534be2cee8b603cf3dd20879a31ce673e923e /Documentation/config.txt | |
| parent | 14230580af96353b911ec1de85517d71c8cfe6b8 (diff) | |
| parent | db9bb280ed7df7858a2de5d1d0334114dd837be0 (diff) | |
| download | git-22a1ae6ef2ba77a20113bbee6f706ec47e6440c5.tar.gz | |
Merge branch 'pt/pull-ff-vs-merge-ff'
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/config.txt')
| -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 0f668bbe11..5f76e8cf4e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2061,7 +2061,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 |