From: Johannes Schindelin Date: Thu, 26 Oct 2006 09:18:23 GMT Subject: merge-recursive, was Re: What's in git.git Message-ID: In-Reply-To: <7vk62npipb.fsf@assigned-by-dhcp.cox.net> Hi, On Thu, 26 Oct 2006, Junio C Hamano wrote: > We'd still need more work on merge-recursive to fix the > overcautious "working file will be overwritten by merge" -- > this is really needed for usability. I am sorry, but I do not have the time to wrap my head around this for at least another week. It seems to be a complicated problem (not the fix, mind you, but the side effects you have to think of!), and I stupidly started to play with shallow clones when I knew I had no time already. BTW what happened to the builtin shortlog? It is the last Perl script I use regularly... (should make people happy who are stuck with Activision Perl...) Ciao, Dscho