| commit | 074b77b78bcf83c3c3dc2cb8435a8de200c47f0e | [log] [tgz] |
|---|---|---|
| author | Tim Schumacher <timschumi@gmx.de> | Sat Oct 13 14:37:54 2018 +0200 |
| committer | micky387 <mickaelsaibi@free.fr> | Mon Oct 07 16:29:37 2024 -0400 |
| tree | 6358349959ba01c6451181f6bdd2b05aaa3110ba | |
| parent | 7bc808f8797009dece73afc866b3d214db0872d1 [diff] |
repopick: Try to fast-forward first Change-Id: I4890ce8075556eb3f57d89c283543f620f39fa02
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: