"Philippe Blain via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > The command used in the example to abort the cherry-pick is 'git reset > --merge ORIG_HEAD', but cherry-pick does not write 'ORIG_HEAD' before > starting its operation. Sorry, but I am confused. Doesn't <1> update ORIG_HEAD used by <3>? > $ git cherry-pick topic^ <1> > $ git diff <2> > -$ git reset --merge ORIG_HEAD <3> > +$ git cherry-pick --abort <3> > $ git cherry-pick -Xpatience topic^ <4> > ------------ > <1> apply the change that would be shown by `git show topic^`.
