| commit | 49d26ba39a2c6894dc2d005b539ff3f2e50528a8 | [log] [tgz] |
|---|---|---|
| author | Tim Schumacher <timschumi@gmx.de> | Sat Oct 13 14:37:54 2018 +0200 |
| committer | Bruno Martins <bgcngm@gmail.com> | Sat Oct 27 21:57:56 2018 +0200 |
| tree | 9b3bc5395c31c25d8c169fb73cd7aebe64ff5463 | |
| parent | b20fd5171e8d42d9292e218477fbbb8bfed1e15d [diff] |
repopick: Try to fast-forward first Change-Id: I4890ce8075556eb3f57d89c283543f620f39fa02
diff --git a/build/tools/repopick.py b/build/tools/repopick.py index 3c7c06c..7c6bf15 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: