Since the time I created my clone, there were changes made to http://code.google.com/p/leveldb and I would like to merge them to my clone, preferably preserving history (i.e. I could merge them manually using a diff/merge tool, but that doesn't preserve git history).
What are the magic commands to perform such merge?
Preferably please provide the complete commands. I imagine it'll involve some combination of git fetch and git merge and remote-tracking branches etc. My problem is not that I can't read man pages for git fetch or merge, I just don't understand them.
Given Lazy Badger's comment below, I've solved half of the issue:
git remote add original https://code.google.com/p/leveldb/
Creates something called 'original' pointing to the source. I can then do:
git pull original master
Which fetches and merges changes from original into my branch master. I would, however, to do it in 2 separate steps: as git fetch and git merge $something to merge into my current branch.
However, after git fetch original, I don't know what $something would be. When I do git branch -a, I don't see anything related to my remote original thingy.
What complicates things is that there are 3 branches in original as well.
So, where do data fetched from original go and how should I refer to it in my git merge $something?