Merge branch 'rs/zip-text'
commitf0b7ab3513cb2bd816b212e66e6716395a683a1c
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2015 23:01:27 +0000 (17 16:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2015 23:01:27 +0000 (17 16:01 -0700)
treefe3ccc4e67e6c629dd87a828e2c6091cbc0f1808
parent6902c4da5855cead535b280a1734771a6fac90e4
parent4aff646d17e81084000100da586bef8f9d6a17a5
Merge branch 'rs/zip-text'

"git archive" can now be told to set the 'text' attribute in the
resulting zip archive.

* rs/zip-text:
  archive-zip: mark text files in archives
archive-zip.c
t/t5003-archive-zip.sh