Re: how to most effectively cherry pick by selective patch hunk?

On Feb 09 2021, Jeff King wrote:

Of course that involves a change to Git, and you were looking for
something you could do with existing versions. :) You can emulate it by
making the commit's parent equivalent to your current state. I.e.:

  git checkout --detach ;# detached HEAD for temporary commit
  git cherry-pick $commit ;# maybe deal with conflicts
  commit=$(git rev-parse --verify HEAD) ;# remember the temp commit
  git checkout - ;# back to your branch
  git checkout -p $commit

Alternatively, you could cherry-pick normally, then use
 git checkout -p HEAD^
to remove what you don't want.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."