From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2016 22:20:07 +0000 (-0800)
Subject: Merge branch 'ls/clean-smudge-override-in-config'
X-Git-Tag: v2.8.0-rc0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3764e7da7ae2c30e2e1bbeaa0961a17bced2078;p=thirdparty%2Fgit.git

Merge branch 'ls/clean-smudge-override-in-config'

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"
---

a3764e7da7ae2c30e2e1bbeaa0961a17bced2078