Merge branch 'jc/archive'
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Sep 2006 09:46:00 +0000 (02:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 17 Sep 2006 09:46:00 +0000 (02:46 -0700)
* jc/archive:
git-tar-tree: devolve git-tar-tree into a wrapper for git-archive
git-archive: inline default_parse_extra()
builtin-archive.c: rename remote_request() to extract_remote_arg()
upload-archive: monitor child communication more carefully.
Add sideband status report to git-archive protocol
Prepare larger packet buffer for upload-pack protocol.
Teach --exec to git-archive --remote
Add --verbose to git-archive
archive: force line buffered output to stderr
Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c
Move sideband server side support into reusable form.
Move sideband client side support into reusable form.
archive: allow remote to have more formats than we understand.
git-archive: make compression level of ZIP archives configurable
Add git-upload-archive
git-archive: wire up ZIP format.
git-archive: wire up TAR format.
Add git-archive

1  2 
Makefile
builtin.h
fetch-pack.c
git.c
diff --cc Makefile
Simple merge
diff --cc builtin.h
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc git.c
Simple merge