diff --git a/bin/git-cp b/bin/git-cp
index f703148eb..b597e8f71 100755
--- a/bin/git-cp
+++ b/bin/git-cp
@@ -39,7 +39,7 @@ else
     fi
 
     MERGE_OPT=
-    ff=$(git config --get merge.ff)
+    ff=$(git config --get merge.ff || true)
     if [[ "$ff" == "only" ]]; then
         MERGE_OPT="--ff"
     fi