summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-09 14:50:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-09 14:50:37 -0700
commit20419de969b8ce0c49d133affdb1bb73eb62815e (patch)
tree8dd2f6f1b4adc1b2beee854ab1bce32a4f6dd48f /Documentation/git-merge-file.txt
parentMerge branch 'es/contacts-blame-L-multi' (diff)
parentbuiltin/fetch.c: Fix a sparse warning (diff)
downloadtgif-20419de969b8ce0c49d133affdb1bb73eb62815e.tar.xz
Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch'
The auto-tag-following code in "git fetch" tries to reuse the same transport twice when the serving end does not cooperate and does not give tags that point to commits that are asked for as part of the primary transfer. Unfortunately, Git-aware transport helper interface is not designed to be used more than once, hence this does not work over smart-http transfer. * jc/transport-do-not-use-connect-twice-in-fetch: builtin/fetch.c: Fix a sparse warning fetch: work around "transport-take-over" hack fetch: refactor code that fetches leftover tags fetch: refactor code that prepares a transport fetch: rename file-scope global "transport" to "gtransport" t5802: add test for connect helper
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions