summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-07 10:40:04 +0200
committerJunio C Hamano <junkio@cox.net>2006-09-07 11:36:31 +0200
commitd9edcbd6061a392c1315ab6f3aedb9992a3c01b1 (patch)
tree518e7aa2d2206def6be99d36a9b2e73cffb1613b /git-merge-one-file.sh
parentmulti-service daemon: documentation (diff)
downloadgit-d9edcbd6061a392c1315ab6f3aedb9992a3c01b1.tar.xz
git-d9edcbd6061a392c1315ab6f3aedb9992a3c01b1.zip
Revert "daemon: add upload-tar service."
This reverts parts of commit 74c0cc2 and part of commit 355f541. Franck and Rene are working on a unified upload-archive which would supersede this when done, so better not to get in their way. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions