Correct handling of branch.$name.merge in builtin-fetch
authorShawn O. Pearce <spearce@spearce.org>
Tue, 18 Sep 2007 08:54:53 +0000 (04:54 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Sep 2007 10:22:31 +0000 (03:22 -0700)
commit85682c1...03a4ae776b0bf2d30d9ecd1e19689131
tree1027268...54eadbbe07ceeddaf0cfc813b5361cd4copy hash to clipboard (tree)
parentd8b3a2b...189a9e7fea76454157b77fa71c9abc05copy hash to clipboard (diff)
builtin-fetch.c
remote.c
remote.h
t/t5515/fetch.br-branches-default-merge
t/t5515/fetch.br-branches-default-merge_branches-default
t/t5515/fetch.br-branches-default-octopus
t/t5515/fetch.br-branches-default-octopus_branches-default
t/t5515/fetch.br-branches-one-merge
t/t5515/fetch.br-branches-one-merge_branches-one
t/t5515/fetch.br-branches-one-octopus
t/t5515/fetch.br-branches-one-octopus_branches-one