From: H. Peter Anvin Date: Tue, 06 Sep 2005 21:33:25 GMT Subject: Re: [PATCH] git-cvsimport-script: handling of tags Message-ID: <431E0B25.5000104@zytor.com> In-Reply-To: <46a038f905090614216eca87eb@mail.gmail.com> Martin Langhoff wrote: > > Tell me more about how you are trying the 'recognize merge'. It is a > pretty unsophisticated thing, as it trusts the commit message in the > first place. But when it works, it works. > Perhaps it would be good to know what it expects in the commit message? My style has always be to use tags for merges; tag the origin branch as well as before and after on the receiving branch. -hpa