![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Mar 2008 23:12:27 +0000 (15:12 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 2 Mar 2008 23:12:27 +0000 (15:12 -0800) | ||
| commit | ac6aa16279ec06633070f5ab9ca414136a292395 | |
| tree | 39c96f0a3415d93f16de3e7bcd1b8e20027828d5 | tree | snapshot |
| parent | d2c425aa2bb8543ea08ca44b04ffacc972a7ad61 | commit | diff |
| parent | 3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06 | commit | diff |
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
* 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