summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Ilari Liusvaara <ilari.liusvaara@elisanet.fi>2009-12-09 17:26:32 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-28 00:24:11 -0800
commitfa8c097cc9b416283ae4c1c1507909ff207b7f60 (patch)
treecfb86e17f3229e7a73e1ac89f97c28e03594e69d /Documentation/git-merge.txt
parentSupport taking over transports (diff)
downloadtgif-fa8c097cc9b416283ae4c1c1507909ff207b7f60.tar.xz
Support remote helpers implementing smart transports
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions