The branch master has been updated via ee7da65b64a2409255d9effb751b4082642e3d39 (commit) from 9d9c86fe443afcb8a13a8ae40b91674a6afefcd3 (commit)
- Log ----------------------------------------------------------------- commit ee7da65b64a2409255d9effb751b4082642e3d39 Author: Tomas Mraz <to...@openssl.org> Date: Wed Apr 28 11:24:42 2021 +0200 ghmerge: Rebase PR on top of master ghmerge rebased the newer commits from master on top of PR first which does not do much sense. Do it the other way around. Also allow fixing eventual trivial rebase conflicts in the background. Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/tools/pull/83) ----------------------------------------------------------------------- Summary of changes: review-tools/ghmerge | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index 06f6bfa..7f0746e 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -180,14 +180,14 @@ function cleanup { } trap 'cleanup' EXIT -git checkout -b $WORK $REF - # append new commits from $REPO/$BRANCH if [ "$PICK" != "yes" ]; then echo Rebasing $REPO/$BRANCH on $REF... - git pull --rebase $REPO $BRANCH || (git rebase --abort; exit 1) + git fetch $REPO $BRANCH && git checkout -b $WORK FETCH_HEAD + git rebase $REF || (echo 'Fix or Ctrl-d to abort' ; read || (git rebase --abort; exit 1)) else echo Cherry-picking $REPO/$BRANCH to $REF... + git checkout -b $WORK $REF git fetch $REPO $BRANCH && git cherry-pick FETCH_HEAD fi