Michael K. Edwards wrote:
On 11/15/06, Linus Torvalds <torvalds@xxxxxxxx> wrote:
Actually, with different people involved it's _much_ better to do it in
one shot.
Why? Because doing a separate "fetch to local space" + "merge from local
space" actually loses the information on what you are merging.
It's a lot more useful to have a merge message like
Merge branch 'for-linus' of
git://one.firstfloor.org/home/andi/git/linux-2.6
than one like
Merge branch 'for-linus'
which is what you get if you fetched it first.
Full ACK from a platform integrator's perspective. Local merge is
great for trial runs but the history in a persistent branch should be
as self-contained and self-explanatory as possible. It shouldn't
depend on what I name local tracking branches, which are just a
convenience so that I can still do trial runs when my connectivity is
broken.
[...]
Coming from me, this is all rather theoretical, as I haven't been
using this particular tool for the purpose long enough to have an
independent opinion. But for what it's worth, the workflow Linus
describes isn't just for the guy at the top of the pyramid.
I think it's unfortunate that git was originally written by Linus, since
he so obviously is "the guy at the top of the pyramid" in many more
senses than just "Linus said this and that patch was OK to commit",
since git was designed to work like king Arthur's round table; "Linus is
in the same circle as me, so ofcourse we help each other out".
All suggestions I've been reading about tracking branches,
separate-remotes and whatnot have their merit. If any of it gets
implemented, I'd still like to be able to do one-shot pulls from remote
repos *without* creating specific tracking branches for it. It's
extremely useful to fetch other peoples topic-branches into my own
"master" (or topic-branch) when I trust their changes to be good. Please
consider that when you're hacking away on whatever changes to do.
--
Andreas Ericsson andreas.ericsson@xxxxxx
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
-
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