From: Junio C Hamano Date: Tue, 19 Jul 2011 16:45:32 +0000 (-0700) Subject: Merge branch 'jk/archive-tar-filter' X-Git-Tag: v1.7.7-rc0~88 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=765c7e4f3100484ea277f043048631ea93b3127a;p=git.git Merge branch 'jk/archive-tar-filter' * jk/archive-tar-filter: upload-archive: allow user to turn off filters archive: provide builtin .tar.gz filter archive: implement configurable tar filters archive: refactor file extension format-guessing archive: move file extension format-guessing lower archive: pass archiver struct to write_archive callback archive: refactor list of archive formats archive-tar: don't reload default config options archive: reorder option parsing and config reading --- 765c7e4f3100484ea277f043048631ea93b3127a