From: Johannes Schindelin Date: Fri, 16 Dec 2005 23:58:50 GMT Subject: Re: git merge questions Message-ID: In-Reply-To: <7voe3gd6ul.fsf@assigned-by-dhcp.cox.net> Hi, just a thought: maybe in this case -- git fails to recognize a rename -- Pasky's idea would have some merit. You could then provide git with some extra information a la .git/info/grafts: "Even if you, git, do not believe it: this file *was* renamed from blah to blop". Ciao, Dscho