1 files changed, 4 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index b8ae005920..0917d0d056 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
 	;;