From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Jan 2008 04:21:04 GMT
Subject: Re: On pathnames
Message-ID: <7vprvq7cy7.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.LNX.1.00.0801242227250.13593@iabervon.org>

Daniel Barkalow <barkalow@iabervon.org> writes:

> $ git checkout branch
> Warning: xt_CONNMARK.c conflicts with xt_connmark.c; not checking it out
> $ git checkout xt_CONNMARK.c --as xt_CONNMARK_caps.c
> $ edit xt_CONNMARK_caps.c
> $ git add xt_CONNMARK_caps.c

Heh, I like that very much.