| commit | 4197361e39a304df30cc492122dbdfe90ae8af0e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Oct 2013 20:21:30 +0000 (23 13:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Oct 2013 20:21:31 +0000 (23 13:21 -0700) | ||
| tree | e64abbced7f07dab484262d7c0dab12af1abe2d0 | treesnapshot (tar.gz zip) |
| parent | eeb8e8373f68b706f5fc8a00760c3dedf239db70 | commitdiff |
| parent | afa15f3cd8f4cbf9572138329be374ff8566b10a | commitdiff |
Merge branch 'mg/more-textconv'
Make "git grep" and "git show" pay attention to --textconv when
dealing with blob objects.
* mg/more-textconv:
grep: honor --textconv for the case rev:path
grep: allow to use textconv filters
t7008: demonstrate behavior of grep with textconv
cat-file: do not die on --textconv without textconv filters
show: honor --textconv for blobs
diff_opt: track whether flags have been set explicitly
t4030: demonstrate behavior of show with textconv
Make "git grep" and "git show" pay attention to --textconv when
dealing with blob objects.
* mg/more-textconv:
grep: honor --textconv for the case rev:path
grep: allow to use textconv filters
t7008: demonstrate behavior of grep with textconv
cat-file: do not die on --textconv without textconv filters
show: honor --textconv for blobs
diff_opt: track whether flags have been set explicitly
t4030: demonstrate behavior of show with textconv