Re: Feature request: git-pull -e/--edit

From: Petr Baudis <pasky@suse.cz>
Date: Nov 20, 2006, 18:11 UTC
Message-ID: <20061120181159.GB7201@pasky.or.cz>
In-Reply-To: <200611201709.kAKH9or1012062@laptop13.inf.utfsm.cl>

On Mon, Nov 20, 2006 at 06:09:50PM CET, Horst H. von Brand wrote:

> Eran Tromer <git2eran@tromer.org> wrote:
> >   A------------F master
> >    \          /
> >     B--C--D--E

..snip..

> And if quux merges back, she gets the same plus a new merge node, and...
> Linus told everybody (quite forcefully, I might add) that this is not
> acceptable for distributed development.

Wrong, if quux merges back and does not do the same "force commit" fast-forward (why would it, anyway - OP clearly said it's only if you _want_ to make it explicit), quux won't get another merge but end up with F as well. It all converges back nicely.

I can see how it could be useful.

> > You'd need to educate users on how to use this responsibly
> 
> Looks like you've never met real users ;-)

Yes, that is a real problem. ;-) But not adding features because users could use them irresponsibly doesn't get you too far.

Show 10 quoted lines

> > And to answer Linus: yes, it's expected that only non-leaf developers
> > will use --force-commit on regular basis, but that's not because
> > maintainers are technically special in any way. It's just because
> > maintainers have something useful to say ("someone's private topic
> > branch, starting at A and ending at E, has just been accepted into my
> > all-important public repo and here's why"). Anyone else can do the same
> > if he feels likewise.
> 
> But the individual changes will presumably reflect said someone's
> authorship.

You are personifying too much. Git setups where multiple people have commit access are very common, and there's no reason to play them down just because Git makes other setups easy.

> If they are interleaved with stuff by others or not doesn't make much
> (development) sense. Yes, it might be interesting for a software
> historian, but that's not git's main audience in the first place.

Tell that to Junio, our pickaxe guy. :^)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
The meaning of Stonehenge in Traflamadorian, when viewed from above, is:
"Replacement part being rushed with all possible speed."