pull: make pull.ff=true override merge.ff

[thirdparty/git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index 4d4fc77b05648c7d2d76ae932b7d68cdf411d364..2aea4fa38a7e2dcb945b419aa44ca89a5fe5b874 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -56,6 +56,9 @@ fi
 # Setup default fast-forward options via `pull.ff`
 pull_ff=$(git config pull.ff)
 case "$pull_ff" in
+true)
+       no_ff=--ff
+       ;;
 false)
        no_ff=--no-ff
        ;;