kernel-rebase: re-implement cherry-pick in terms of am

git cherry-pick uses the same mechanism for automatic conflict
resolution as patches in files (see CL:3139904). This makes rebase
results different across machines depending on local git history, which
is undesired. To address this, when a cherry-pick is requested, rebase
scripts will now export the commit to a patch file using existing
machinery and thus strip unwanted index information, making the results

TEST=./, then run triage()

Change-Id: Idba649481ed15ca7d2bb7bceb51effcb8893c267
Reviewed-by: Guenter Roeck <>
Commit-Queue: Kamil Koczurek <>
Tested-by: Kamil Koczurek <>
2 files changed