From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Mar 2008 23:12:27 +0000 (-0800)
Subject: Merge branch 'pb/cvsimport'
X-Git-Tag: v1.5.5-rc0~87
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac6aa16279ec06633070f5ab9ca414136a292395;p=git.git

Merge branch 'pb/cvsimport'

* pb/cvsimport:
  cvsimport: document that -M can be used multiple times
  cvsimport: allow for multiple -M options
  cvsimport: have default merge regex allow for dashes in the branch name
---

ac6aa16279ec06633070f5ab9ca414136a292395