Re: Git BOF notes
- From
Petr Baudis <pasky@suse.cz>
- Date
- Jul 21, 2006, 14:31 UTC
- Message-ID
- <20060721143115.GN13776@pasky.or.cz>
- In-Reply-To
- <20060721132111.GD32585@fieldses.org>
Dear diary, on Fri, Jul 21, 2006 at 03:21:11PM CEST, I got a letter where "J. Bruce Fields" <bfields@fieldses.org> said that...
Show 8 quoted lines
> On Thu, Jul 20, 2006 at 01:01:55AM +0200, Petr Baudis wrote: > > * Support for distributing and following the mutated history. > > I'm actually not sure about the level of Git support for > > this, Cogito supports cg-updating to a mutated history > > if you have no local changes. > > A fetch that doesn't fast-forward fails with a warning unless you > explicitly ask it (--force) to blow away your old history.
I don't know if there's a point in being so paranoid - it already makes things more painful than necessary. In the tracking branch, you just want to have what the other side has anyway, and if the other side decided to jump around, why would you care otherwise?
Just make sure you print the original commit ID and perhaps a warning.
> I don't see what more you could do.
I guess a huge majority of Git users is an - almost inherently - silent mass of those who just use Git for tracking the development of others, and we gotta make it easy for them - and it's not easy if when the remote side rebases it doesn't just move them to the new commit but helpfully offers a nonsensical three-way merge.
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Snow falling on Perl. White noise covering line noise. Hides all the bugs too. -- J. Putnam