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 /git-pull.sh | |
| parent | 14230580af96353b911ec1de85517d71c8cfe6b8 (diff) | |
| parent | db9bb280ed7df7858a2de5d1d0334114dd837be0 (diff) | |
| download | git-22a1ae6ef2ba77a20113bbee6f706ec47e6440c5.tar.gz git-22a1ae6ef2ba77a20113bbee6f706ec47e6440c5.tar.xz | |
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 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index b8ae00592..0917d0d05 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -54,8 +54,11 @@ then fi # Setup default fast-forward options via `pull.ff` -pull_ff=$(git config pull.ff) +pull_ff=$(bool_or_string_config pull.ff) case "$pull_ff" in +true) + no_ff=--ff + ;; false) no_ff=--no-ff ;; |