]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fbf4bdf 1a8630d)
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)
commita3764e7da7ae2c30e2e1bbeaa0961a17bced2078
tree4cc71f632465d8043e6d523bdfe6837f7c4e1e42tree | snapshot
parentfbf4bdfbf1ce543818363e7bc9286d73a61c0648commit | diff
parent1a8630dc3b1cc6f1361a4e5d94630133c24c97d9commit | diff
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"
convert.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.