StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repopick: Try to fast-forward first

Browse Source 
Change-Id: I4890ce8075556eb3f57d89c283543f620f39fa02
This commit is contained in:
Tim Schumacher
2018-10-13 14:37:54 +02:00
committed by Bruno Martins
parent b20fd5171e
commit 49d26ba39a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tools/repopick.py
View File

@@ -448,7 +448,7 @@ if __name__ == '__main__':
sys.exit(result) sys.exit(result)
# Perform the cherry-pick # Perform the cherry-pick
if not args.pull: if not args.pull:
cmd = ['git cherry-pick FETCH_HEAD'] cmd = ['git cherry-pick --ff FETCH_HEAD']
if args.quiet: if args.quiet:
cmd_out = open(os.devnull, 'wb') cmd_out = open(os.devnull, 'wb')
else: else: