Andrew's git / gitweb.git / diff
?
Merge branch 'nd/archive-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Oct 2014 20:05:25 +0000 (13:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Oct 2014 20:05:26 +0000 (13:05 -0700)
"git archive" learned to filter what gets archived with pathspec.

* nd/archive-pathspec:
archive: support filtering paths with glob

1  2 
archive.c patch | diff1 | diff2 | blob | history
t/t5000-tar-tree.sh patch | diff1 | diff2 | blob | history
diff --cc archive.c
Simple merge
diff --cc t/t5000-tar-tree.sh
Simple merge