summaryrefslogtreecommitdiff
path: root/quote.h
diff options
context:
space:
mode:
authorLibravatar Florian Forster <octo@verplant.org>2006-05-31 12:32:08 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-31 14:22:28 -0700
commit65160b8b04f814ab5b2573b32605320ff875f99e (patch)
treec0f12ea9981aa7dc902792d62a69793e273cb72d /quote.h
parentImproved pack format documentation. (diff)
downloadtgif-65160b8b04f814ab5b2573b32605320ff875f99e.tar.xz
git-svnimport: Improved detection of merges.
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. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'quote.h')
0 files changed, 0 insertions, 0 deletions