]> git.ipfire.org Git - thirdparty/git.git/commit - git-cvsimport.perl
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7863c61) | patch
git-cvsimport: fix merging with remote parent branch
authorMarc-Andre Lureau <marcandre.lureau@gmail.com>
Wed, 12 Mar 2008 19:54:21 +0000 (21:54 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Mar 2008 04:03:39 +0000 (21:03 -0700)
commitc36c5b845e1958bad1b69ee42e3da926de4f948b
tree3f5d0191d3a303b4d8ce20fef828abb2fef4b897tree | snapshot
parent7863c612f402268b5978683f44adad3a7a867613commit | diff
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>
git-cvsimport.perl diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.