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 /builtin-merge-recursive.c | |
| parent | gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form (diff) | |
| download | git-c36c5b845e1958bad1b69ee42e3da926de4f948b.tar.gz git-c36c5b845e1958bad1b69ee42e3da926de4f948b.zip | |
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 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions