backport-wrangle-into-commit.rej

#!/bin/sh

REMOTE="upstream"
BRANCH="jasper/backport/10528/5.2"
COMMIT_MSG=`cat backport-commit-message.rej`

git reset --soft $REMOTE/$BRANCH
git stash
git reset --hard HEAD^
git stash apply --index

git commit -m "$COMMIT_MSG" --no-verify