Re: LCA2006 Git/Cogito tutorial

From: Petr Baudis <pasky@suse.cz>
Date: Oct 21, 2005, 00:51 UTC
Message-ID: <20051021005145.GB30889@pasky.or.cz>
In-Reply-To: <4352F4C9.1040703@catalyst.net.nz>

Dear diary, on Mon, Oct 17, 2005 at 02:48:09AM CEST, I got a letter where "Martin Langhoff (CatalystIT)" <martin@catalyst.net.nz> told me that...

> Petr Baudis hinted earlier that he might be coming, as did Linus (but
> he was hoping for a sponsor, I'm not sure whether he'll be there or
> not). Speak up if you'll be there!

I'm sorry but I will not be there - it is too far away from my little country. :-(

Show 6 quoted lines

> I'll post my slides and presentation plan beforehand to the list, to
> avoid spreading misinfirmation/bad practices. They will probably be
> based on a recent talk I gave @ Wellington Perl Mongers about
> swtiching to Git/Cogito:
> 
>    http://wellington.pm.org/archive/200510/git/

(i) You might want to say "cg-export" instead of "git-tar-tree" (*shrug*)

(ii) You say:

	- Very fast stupid merge
	    ... and very smart, slow merges when stupid won't do

  What are you explicitly referring to? I don't think any kind of merge
in GIT (unless something totally missed me) can be called "very smart".
If it's a three-way merge, it's never "very smart".

(iii) I have only one major problem with your file:

	emacs .gitignore

  This should be obviously:

	vim .gitignore

;-)

> ps: lately, about 30% of my emails to git@vger from gmail have been 
> dropped on the floor. This is starting to get annoying, is anyone seeing 
> similar issues?

Not me. Perhaps I'm in some VIP class. :^)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.