Github: Pull some commits from fork into original project

Question

I, user1, have a project at github. Another user2 created a fork and made three commits: A B and C.

I want to merge only commits A and B back into my project.

How to do it, that I could keep the history in github's network graph?

score 1 · Answer 1 · edited May 23 '17 at 12:17

1

You can add a remote reference to the fork, create a branch on B, and merge that branch (in, for instance, master):

git remote add fork /url/of/fork
git fetch --all
git branch tmp fork/B
git checkout master
git merge tmp

I find the merge cleaner than using git cherry-pick.

The OP Michał Sałaban preferred (in the comments) create the branch with:

git checkout B 
git branch tmp

edited May 23 '17 at 12:17

Community

answered Jul 05 '14 at 13:44

VonC

Actually it was: `git remote add fork /url/of/fork` `git fetch --all` `git checkout B` `git branch tmp` `git checkout master` `git merge tmp` – emesik Jul 05 '14 at 15:19
@MichałSałaban good points. I have included them in the answer for more visibility. – VonC Jul 05 '14 at 15:21

score 0 · Answer 2 · answered Jul 06 '14 at 02:39

I suggest to use github pull request.

How?

simple:

open a new branch from your current state

git checkout "COMMIT_B_ID"

this will result in detached HEAD

now create a new named branch

git checkout "MY_B_BRANCH"
git push origin MY_B_BRANCH

now github contains new branch with your changes. Go to github and open a pull reauest to merge the new branch with the master

This way (Pull requsest) you can see and verfiy that this is exactly what needs to be commited.

Godd Luck.

2 Answers2