Using GIT, how can I selectively merge changes from one commit on another 'fork'?

Take this scenario:

  1. I decide to 'fork' a codebase on github.com, and start doing my routine: Edit - Commit - Push; aka hack hack hack.
  2. After I made some changes, I see some changes another person has made on the same project, and I like them!
  3. I decide I want to merge them into mine. Problem is, I only want a 'portion' of one particular commit, out of several commits he has made.

What would be the most efficient method of getting these select amount of changes, merged into my 'fork'?

31696 次浏览
小开

If you only want a port of a commit, you’re probably best off by cherry-picking the commit you want and resetting files you don’t want touched.

git cherry-pick SHA1
git checkout HEAD file1 file2 ... fileN

Of course, if you have several modified parts in a file and only want to keep some of them you have no choice but to edit the file manually, cutting out their changes.

小开

I'm not clear on what you want. If you want to bring in only certain commits from the other forks, you can use git cherry-pick SHA. Full explanation on gitready.

小开
最佳答案

After trolling the waves of the IRC world, someone gave a great solution:

git cherry-pick SHA1 --no-commit
git add --patch

Hopefully that helps anyone else with the same question!

EDIT: OK, maybe it isn't quite that simple. Here are the full steps:

  1. First you have to be in your repository, do the necessary cd-ing to get to your working directory.

  2. You now need to add the remote branch, and then fetch it. Do this by:

    git remote add someUser git://github.com/someUser/someRepo.git

    git fetch someUser

  3. You can now run commands such as git log someUser/master to find the commit SHA1 you want to merge in 'partially'.

  4. Once you have the SHA, you can now run:

    git cherry-pick -n SHA1

    where SHA1 is the commit SHA, duh!

  5. There quite possibly will be conflicts, depending how old the commit is, and how often that particular area of the project changes. Sorry, but you have to manually resolve these with your trusty editor. So pull out VIM, or whatever else you use, and hack away at the conflicts until you get to the stage where you like the changes.

  6. You now have to reset the index to the HEAD revision, then you can then use the trusty GIT add --patch command to pick and choose what changes you want:

    git reset HEAD

    git add --patch or git add -p

  7. Yay! Commit time:

    git commit -m "I merged a select amount of changes"

  8. To clean up the mess (The stuff you said no to in git add --patch) and only keep the selected changes in your working repository, run:

    git reset --hard HEAD

    Apparently git checkout -f is another option as well.

小开

I really like Tim's solution, however sometimes I like tinkering in vimdiff. My solution to this problem is crude, but it works for me because I like vim.

I have vimdiff set as my difftool, and then to selectively merge I diff the branch:

git difftool <branch> <file>

Then I go to the pane with the current branch's version and edit the original in vim (sometimes this isn't necessary, but sometimes vimdiff opens a version in /tmp) and disable read-only mode:

:e <file>
:set readonly!

Now I can use vim's patch tools such as do and dp to apply what I want, and make other little edits as I go. When I am done, I save the file, exit out of vim, and then stage and commit the file in git like a regular edit.

As I said, this isn't particularly sophisticated, but it is very powerful, and still purely in the command line. Just be sure to add a clear commit message, as git won't automatically include a merge message for you.

vimdiff example


提交答案