Merge branch 'cc/cherry-pick-stdin'

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 436b7f5977c05c347debc12130f822af482c03e3..6b86abc64bfe0034caf23cf9530955128766de32 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -974,8 +974,9 @@ EOF
 
                test -d "$REWRITTEN" || test -n "$NEVER_FF" || skip_unnecessary_picks
 
+               output git checkout $ONTO || die_abort "could not detach HEAD"
                git update-ref ORIG_HEAD $HEAD
-               output git checkout $ONTO && do_rest
+               do_rest
                ;;
        esac
        shift