]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3d092bf) | patch
transport-helper: mismerge fix
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 31 Oct 2013 09:36:29 +0000 (03:36 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Oct 2013 18:16:40 +0000 (11:16 -0700)
commita21455ae664c1a29c157e2bc5ea3abe8e2699eca
tree849957bb922b5521c8a241bf9d941143d75cdaeatree | snapshot
parent3d092bfc6f2d9a998967979f926c661e9762601ccommit | diff
transport-helper: mismerge fix

Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.

Reported-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
transport-helper.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.