diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index ec01e0b..80919d0 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -454,7 +454,7 @@
                 sys.exit(result)
         # Perform the cherry-pick
         if not args.pull:
-            cmd = ['git cherry-pick FETCH_HEAD']
+            cmd = ['git cherry-pick --ff FETCH_HEAD']
             if args.quiet:
                 cmd_out = open(os.devnull, 'wb')
             else: