From 49d26ba39a2c6894dc2d005b539ff3f2e50528a8 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sat, 13 Oct 2018 14:37:54 +0200
Subject: [PATCH] repopick: Try to fast-forward first

Change-Id: I4890ce8075556eb3f57d89c283543f620f39fa02
---
 build/tools/repopick.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index 3c7c06ca..7c6bf153 100755
--- 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: