commit e9e2b1812ade9eb5892fa6e9de2795a55fa996d1
author Tim Schumacher <timschumi@gmx.de> Sat Oct 13 14:37:54 2018 +0200
committer Vaughn <rwaterspf1@floydco.net> Wed Nov 28 05:26:28 2018 +0530
tree e6ab22fd232306aff7bf33f8af8aedd075ed108c
parent 8dd6b9d3da6aa71a385b249d2cea6496804ea7f8

repopick: Try to fast-forward first

Change-Id: I4890ce8075556eb3f57d89c283543f620f39fa02
Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com>

build/tools/repopick.py

diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index 2577652..96149bd 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -448,7 +448,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: