repopick: Try to fast-forward first

Change-Id: I4890ce8075556eb3f57d89c283543f620f39fa02
2018-10-13 14:37:54 +02:00
parent b20fd5171e
commit 49d26ba39a
1 changed files with 1 additions and 1 deletions
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -448,7 +448,7 @@ if __name__ == '__main__':
                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: