Partly cherry-picking a commit with Git

Question

I m working on 2 different branches  release and development    I noticed I still need to integrate some changes that were committed to the release branch back into the development branch     The problem is I don t need all of the commit  only some hunks in certain files  so a simple    git cherry-pick bc66559   does not do the trick     When I do a  git show bc66559   I can see the diff but don t really know a good way of applying that partially to my current working tree

User · Answer

I know I m answering an old question  but it looks like there s a new way to do this with interactively checking out   git checkout -p bc66559   Credit to Can I interactively pick hunks from another git commit

User · Answer

If  partly cherry picking  means  within files  choosing some changes but discarding others   it can be done by bringing in git stash    Do the full cherry pick  git reset HEAD  to convert the entire cherry-picked commit into unstaged working changes  Now git stash save --patch  interactively select unwanted material to stash  Git rolls back the stashed changes from your working copy  git commit Throw away the stash of unwanted changes  git stash drop     Tip  if you give the stash of unwanted changes a name  git stash save --patch junk then if you forget to do  6  now  later you will recognize the stash for what it is

User · Answer

Actually  the best solution for this question is to use checkout commend git checkout  lt branch gt   lt path1 gt   lt path2 gt      For example  assume you are in master  you want to the changes from dev1 on project1 Controller WebController1 java and project1 Service WebService1 java  you can use this  git checkout dev1 project1 Controller WebController1 java project1 Service WebService1 java  That means the master branch only updates from dev1 on those two paths

User · Answer

Use git format-patch to slice out the part of the commit you care about and git am to apply it to another branch  git format-patch  lt sha gt  -- path to file git checkout other-branch git am   patch

User · Answer

If you want to specify a list of files on the command line  and get the whole thing done in a single atomic command  try   git apply --3way  lt  git show -- list-of-files   --3way  If a patch does not apply cleanly  Git will create a merge conflict so you can run git mergetool  Omitting --3way will make Git give up on patches which don t apply cleanly

User · Answer

The core thing you re going to want here is git add -p  -p is a synonym for --patch   This provides an interactive way to check in content  letting you decide whether each hunk should go in  and even letting you manually edit the patch if necessary   To use it in combination with cherry-pick   git cherry-pick -n  lt commit gt    get your patch  but don t commit  -n   --no-commit  git reset                     unstage the changes from the cherry-picked commit git add -p                    make all your choices  add the changes you do want  git commit                    make the commit     Thanks to Tim Henigan for reminding me that git-cherry-pick has a --no-commit option  and thanks to Felix Rabe for pointing out that you need to reset  If you only want to leave a few things out of the commit  you could use git reset  lt path gt     to unstage just those files    You can of course provide specific paths to add -p if necessary  If you re starting with a patch you could replace the cherry-pick with apply     If you really want a git cherry-pick -p  lt commit gt   that option does not exist   your can use  git checkout -p  lt commit gt    That will diff the current commit against the commit you specify  and allow you to apply hunks from that diff individually  This option may be more useful if the commit you re pulling in has merge conflicts in part of the commit you re not interested in   Note  however  that checkout differs from cherry-pick  checkout tries to apply  lt commit gt  s contents entirely  cherry-pick applies the diff of the specified commit from it s parent  This means that checkout can apply more than just that commit  which might be more than you want

User · Answer

Building on Mike Monkiewicz answer you can also specify a single or more files to checkout from the supplied sha1 branch   git checkout -p bc66559 -- path to file java    This will allow you to interactively pick the changes you want to have applied to your current version of the file

User · Answer

Assuming the changes you want are at the head of the branch you want the changes from  use git checkout  for a single file    git checkout branch that has the changes you want path to file rb   for multiple files just daisy chain    git checkout branch that has the changes you want path to file rb path to other file rb

[git] Partly cherry-picking a commit with Git

Examples related to git

Examples related to git-cherry-pick