diff options
| author | Marc-Andre Lureau <marcandre.lureau@gmail.com> | 2008-03-12 21:54:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-12 21:03:39 -0700 |
| commit | c36c5b845e1958bad1b69ee42e3da926de4f948b (patch) | |
| tree | 3f5d0191d3a303b4d8ce20fef828abb2fef4b897 /csum-file.h | |
| parent | 7863c612f402268b5978683f44adad3a7a867613 (diff) | |
| download | git-c36c5b845e1958bad1b69ee42e3da926de4f948b.tar.gz git-c36c5b845e1958bad1b69ee42e3da926de4f948b.tar.xz | |
git-cvsimport: fix merging with remote parent branch
commit-tree fails when specifying a remote name (via -r option) and
one of the parent branch has a name. Prefixing with "$remote/" fix it.
Signed-off-by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.h')
0 files changed, 0 insertions, 0 deletions