Andrew's git / gitweb.git / diff
?
Merge branch 'ls/filter-process' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:08 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:08 +0000 (15:19 -0800)
Doc update.

* ls/filter-process:
t0021: fix flaky test
docs: warn about possible '=' in clean/smudge filter process values

1  2 
t/t0021-conversion.sh patch | diff1 | diff2 | blob | history
t/t0021/rot13-filter.pl patch | diff1 | diff2 | blob | history
diff --cc t/t0021-conversion.sh
Simple merge
diff --cc t/t0021/rot13-filter.pl
index 4d5697ee51c673abbe8a1a90b58bf5b7b9856ce1,02b3363fd9d1bb040c441b9a589afb3dfc8f8ed9..617f581e56cac95191d6f1301566fa6671ecaf6f
mode 100644,100755..100644
--- 1/t/t0021/rot13-filter.pl
--- 2/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl