Re: [PATCH] git-svnimport: Improved detection of merges.

From

Junio C Hamano <junkio@cox.net>

Date

Jun 1, 2006, 07:12 UTC

Message-ID

<7vlkshs618.fsf@assigned-by-dhcp.cox.net>

In-Reply-To

<11490715283626-git-send-email-octo@verplant.org>

Florian Forster <octo@verplant.org> writes:

> The regexes detecting merges (while still relying on the commit messages,
> though) have been improved to catch saner (and hopefully more) messages. The
> old regex was so generic that it often matched something else and missed the
> actual merge-message.

> Also, the regex given with the `-M' commandline-option is checked first:
> Explicitely given regexes should be considered better than the builtin ones,
> and should therefore be given a chance to match a message first.