Re: [hibernate-dev] Hibernate Core is now using Git
On 7 oct. 2010, at 20:51, Steve Ebersole <steve(a)hibernate.org> wrote:
> o prefer rebase over merge
> Rebase put changes from the branch you forked below the new commits you
> have done and thus keep the history linear.
>
> got checkout HHH-XXX
> git rebase master
>
> DO NOT rebase a branch that you have shared publicly (unless you know
> people won't use it or you wish them harm).
These 2 comments seem at odds in regards to bugfix branches (aka '3.2',
'3.3'
and '3.5' currently).
You mean to backport fixes to to work on specific bug fixes?
To back port fixes, use
git cherry-pick sha1ofthecommit(s)
Though preferably on a topic branch as seen below.
To work on a specific bug fix, create a topic branch off 3.5
git checkout 3.5
git checkout -b HHH-XXX
//fix and commit(s)
Then make sure you have the latest from github
git checkout 3.5
git pull github 3.5
Then rebase off 3.5
//on HHH-XXX
git rebase 3.5
From there, HHH-XXX should be an upstream of 3.5 and you can do
git checkout 3.5
git merge HHH-XXX
#being upstream, the tip will simply move up and no actual merge is performed
git push github 3.5