Welcome! Log In Create A New Profile

Advanced

Git History merge

Posted by bodhi 
Forum List Message List New Topic
bodhi
Git History merge
November 22, 2015 06:24PM
I'm having some difficulty with Git usage.

I've decided to start fresh so I can rebase u-boot-kirkwood and u-boot-oxnas to 2015.10 and tracking mainline branch. It was done OK. Both u-boot-kirkwood and u-boot-oxnas GitHub now have a new branch that tracks mainline master branch.

Now the problem is the history of the old branch did not carry over to the new branch!

2014.07.c-kirkwood ----> 2015.10-kirkwood
oxnas ----> 2015.10-oxnas

If you are experienced with Git, please suggest a way to only merge the history of the 2 branches together. Note that I want no real merge to occur to the latest branch (since it is already good as I'd like it to be)

TIA

-bodhi
===========================
Forum Wiki
bodhi's corner (buy bodhi a beer)
Reply Quote
Newer Topic Older Topic
Author:

Your Email:


Subject:
Spam prevention:
Please, enter the code that you see below in the input field. This is for blocking bots that try to post this form automatically. If the code is hard to read, then just try to guess it right. If you enter the wrong code, a new image is created and you get another chance to enter it right.
Message: