summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2008-03-25 19:35:28 -0400
committerJunio C Hamano <gitster@pobox.com>2008-03-26 00:50:51 -0700
commit472fa4cd33c690dd9b338c02af3ed135666aea43 (patch)
tree5d26a3bdc95ae0b66d85ba55cfbebb6486b335ec /merge-recursive.c
parentc091b3d415f95d3e4e62acddb084e211af46acbf (diff)
downloadgit-472fa4cd33c690dd9b338c02af3ed135666aea43.tar.gz
Fix branches file configuration
Fetched remote branch from .git/branches/foo should fetch into refs/heads/foo. Also when partial URL is given, the fetched head should always be remote HEAD, and the result should not be stored anywhere. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions