1 files changed, 15 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh
index b946fd975b..44b792a5d2 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -52,6 +52,21 @@ if test -z "$rebase"
 then
 	rebase=$(bool_or_string_config pull.rebase)
 fi
+
+# Setup default fast-forward options via `pull.ff`
+pull_ff=$(git config pull.ff)
+case "$pull_ff" in
+false)
+	no_ff=--no-ff
+	break
+	;;
+only)
+	ff_only=--ff-only
+	break
+	;;
+esac
+
+
 dry_run=
 while :
 do