Re: small merge tool for temporary merges

From: Petr Baudis <pasky@suse.cz>
Date: Aug 3, 2008, 16:58 UTC
Message-ID: <20080803165805.GY32184@machine.or.cz>
In-Reply-To: <20080803163415.GB14513@gmx.de>

Hi,

On Sun, Aug 03, 2008 at 06:34:15PM +0200, Marc Weber wrote:

Show 9 quoted lines

> I'd like to announce the exisntance of my small git test merge tool.
> 
> After reading 
>  Linux kernel mailing list may remember that Linus complained about such
>  too frequent test merges when a subsystem maintainer asked to pull from
>  a branch full of "useless merges"
> in the man page of git-rerere I had to start it..
> 
> $ git clone git://mawercer.de/git-test-merge

  for the mildly curious ones, your friendly gitweb provider service
offers

	http://repo.or.cz/w/git-test-merge.git

				Petr "Pasky" Baudis