summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-09-17 18:43:36 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-09-17 18:43:36 -0700
commit808239a7db1b4c04c5a9edcf9ee33ff33217fad2 (patch)
tree1b9cfbe8113e9fedb21a8ae519c1b710d79164ce /Documentation/git-merge-tree.txt
parentMerge part of branch 'jc/upload-pack' (diff)
parentAdd ftp:// protocol support for git-http-fetch (diff)
downloadtgif-808239a7db1b4c04c5a9edcf9ee33ff33217fad2.tar.xz
Merge branch 'sk/ftp'
* sk/ftp: Add ftp:// protocol support for git-http-fetch http-fetch.c: consolidate code to detect missing fetch target
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions