Hi,
On Sat, 21 Jul 2007, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
>
> > ...
> > - Make the current revision my new 'master'. That branch already exists,
> > and I am on 'christian-new', though. No problem:
> >
> > $ git branch -M christian-new master
> >
> > (But if you do that with "-M", which means _force_ rename, make sure
> > twice that this is really what you want.)
> >
> > - Push it.
> >
> > $ git push origin +master
> > ...
> > refs/heads/master: da7b699[...] -> cc2b761b[...]
> >
> > The "+" is necessary, since I rebased it...
> >
> > If there were more pushers than just me, I'd verify that da7b699 is
> > indeed the old state of my master:
> >
> > $ git reflog
> > ...
> > d36cd96... HEAD@{20}: checkout: moving from master to christian-new
> > da7b699... HEAD@{21}: commit [...]
> >
> > Yep.
> >
> > Good. Happy.
>
> Two questions and a half.
>
> - The above means git-gui-i18n.git's master is rebased. Is
> that the intention? IOW, people are supposed to work on it
> with fetch+rebase, not fetch+merge (= pull)?
Okay, you have me there. Usually I am the one saying "rebasing is bad".
So I'll refrain from that practice. From now on, 'master' will _not_ be
rebased. From time to time I will prepare 'for-shawn' branches, which are
"master rebased onto git-gui".
In related news, I will push to 'mob' whenever I update 'master'. I will
never force a push to 'mob', and neither should anybody else have to.
(Except in the case that you want to correct one of your pushes.)
> - It seems that the tip of 'mob' now is out of sync wrt
> 'master'. What's the plan to update it with framework
> changes made in 'master' (e.g. addition of po/glossary.csv)?
IMHO the best practice is to keep it up-to-date with 'master', as I
outlined above.
> [Half a question about po/glossary.csv]
This was answered by Christian, I guess.
Ciao,
Dscho
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
