From: Caleb Cushing <xenoterracide@gmail.com>
Date: Fri, 20 Feb 2009 02:17:19 GMT
Subject: Re: merge smart enough to adapt to renames?
Message-ID: <81bfc67a0902191817u11361d0bw1f2215a53e284f8f@mail.gmail.com>
In-Reply-To: <slrngprunn.hbo.sitaramc@sitaramc.homelinux.net>

> Not sure I understood this completely, but I've found it
> helps to make the rename/move as a separate commit, then
> start changing stuff.  In other words, do too many things in
> the same commit, and you could lose this coolness.

well I the problem is.. in a sense I need to unmerge 2 files that I
once merged... they currently have the same name and are in the same
place, and where I merge them from they'll continue to have that  name
(although they are different files with the same purpose) but I want
them to have different names and spots in my tree/repo.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com