diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:12:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:12:27 -0800 |
| commit | ac6aa16279ec06633070f5ab9ca414136a292395 (patch) | |
| tree | 39c96f0a3415d93f16de3e7bcd1b8e20027828d5 /lockfile.c | |
| parent | d2c425aa2bb8543ea08ca44b04ffacc972a7ad61 (diff) | |
| parent | 3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06 (diff) | |
| download | git-ac6aa16279ec06633070f5ab9ca414136a292395.tar.gz git-ac6aa16279ec06633070f5ab9ca414136a292395.tar.xz | |
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
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions