Merge branch 'ls/clean-smudge-override-in-config'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:07 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:07 +0000 (14:20 -0800)
Clean/smudge filters defined in a configuration file of lower
precedence can now be overridden to be a pass-through no-op by
setting the variable to an empty string.

* ls/clean-smudge-override-in-config:
convert: treat an empty string for clean/smudge filters as "cat"

1  2 
convert.c
diff --cc convert.c
Simple merge