This is the mail archive of the
newlib@sourceware.org
mailing list for the newlib project.
Re: Moving the git master branch
- From: Luca Barbato <lu_zero at gentoo dot org>
- To: newlib at sourceware dot org
- Date: Thu, 28 May 2015 13:37:28 +0200
- Subject: Re: Moving the git master branch
- Authentication-results: sourceware.org; auth=none
- References: <20150528094702 dot GO16927 at calimero dot vinschen dot de> <5566E72F dot 2000508 at gentoo dot org> <20150528112006 dot GA29336 at calimero dot vinschen dot de>
On 28/05/15 13:20, Corinna Vinschen wrote:
> So, three strategies now. Which one is the best? I saw the renaming
> strategy on the net and it seemed to be the one with the least hassle...
Just make sure you have everybody to git pull --rebase to not have too
many horrible surprises on their trees (even better, use git fetch and
check the result).
If renaming makes you happy about the contents, I do not see why do
otherwise.
If you need to move more commits around `git rebase -i` is a boon, you
can literally cut away the list of commit from a branch and then switch
branch and use `git rebase -i ${starting hash}` and paste them.
I use it quite often when I have to do multiple cherry-picks from my
topic branches.
lu
PS: In case you are afraid of not being able to rollback easily your
local tree, `git reflog` is a boon.