101

I have this commit that was undone by someone who doesn't know how to deal with conflicts. Is there an easy way to try auto merging the commit back in? I tried using "merge to master" but it just says up to date. I am using tortoisegit.

Yue Lin Ho
  • 2,945
  • 26
  • 36
Will
  • 10,013
  • 9
  • 45
  • 77

1 Answers1

150

That's what git cherry-pick is for. It lets you apply changes by using already existing commits.

The basic syntax is:

git cherry-pick <commit> ...
2240
  • 1,547
  • 2
  • 12
  • 30
svick
  • 236,525
  • 50
  • 385
  • 514
  • 9
    Amazing! Of course I knew `git cherry-pick`, but I didn't think about using it in this case. Thanks! – rkallensee Apr 14 '16 at 21:58
  • For those wanting to cherry pick a particular commit, you can just do `git cherry-pick [commit number here]` – levininja Oct 23 '18 at 13:58
  • 1
    What if that person has overwritten 4 of your commits? Can you cherry pick them as a group? – Janneman96 Oct 30 '18 at 13:34
  • 3
    @Janneman96 AFAICT, `git cherry-pick` can accept more than one commit, but it creates a new commit for each of them. One solution to that would be to then use `git rebase -i` to combine the new commits into one. – svick Oct 31 '18 at 14:42