Re: Avoiding uninteresting merges in Cairo

From: Shawn Pearce <spearce@spearce.org>
Date: Dec 15, 2006, 03:25 UTC
Message-ID: <20061215032530.GM26202@spearce.org>
In-Reply-To: <87tzzx4zm7.wl%cworth@cworth.org>

Carl Worth <cworth@cworth.org> wrote:

> One thing I've been meaning to do is to write up a more complete
> introduction on using git to manage cairo's tree to put into cairo's
> wiki or so, (it would have helped a newcomer like jwatt here).

I saw three things happen to poor jwatt that really threw him for a loop, and I think they are all more likely related to Git than to the Cairo project specifically:

 * His user.name/user.email is probably not what he wanted;

 * His Cygwin/Windows system made some *.c/*.c files 0755 without
   him realizing it;

 * gitweb made it appear as though a whole lot of Carl's recent
   work was somehow undone in the merge.