Question

Yes, I know I should have just forked the project from the beginning, but this is what situation I’m in now. 🙂

I have a local Git repository that contains my blog, on my local computer, that has several months of commit history. Originally, I simply downloaded the files from the repository
http://github.com/mojombo/mojombo.github.com, and I continued on with my local Git repository, with the first commit looking like the latest files from mojombo’s repository.

I would now like to fork the project and have my local Git repository commits be replayed on top of it, so it looks like I forked the project from the beginning, and then pushed it back to my forked version of mojombo’s repository, on my GitHub account:

http://github.com/program247365/mojombo.github.com

So perhaps the history would then look like this:

mobjombo repository:         1---2---3----23
                                  \
my blog repository commits:       24---25---

What Git commands can I use exactly to do this?

I’ve looked at this question. Will I have to add mojombo’s repository as a remote to my project, and then pull it in, merge, resolve conflicts, and then push to my forked project on GitHub?

Answer 1

When I tried git pull it gave me the following error:

$ git pull grid master:master
! [rejected]        master     -> master  (non fast forward)

In my particular case, it seemed that git rebase was the way to go for me, as shown by the steps here:

#Clone my forked project from github
git clone [e-mail]:program247365/mojombo.github.com.git 

#Add my repo as a remote repo, with the alias 'grid'
git remote add grid "path/to/remote/gitrep/with/all/history/unrelated/to/mojombo/" 

#Rebase my commits on top of mojombo's
git rebase master grid/master

#Switch to the local master branch 
git checkout master

#Call up my mergetool via git, to start rectifying the conflicts that emerge between my repo, and mojombo's
git mergetool

#Push my rebased/combined repo back to Github.com
git push github