Junio C Hamano wrote: > git-rebase --autostash > > git commit --allow-empty -m 'index part' > git commit --allow-empty -a -m 'working tree part' > git rebase --onto $UPSTREAM > git reset HEAD^ > git reset --soft HEAD^ Why are you rolling your own stash? What do you have against git stash? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html