diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-10 14:20:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-10 14:20:07 -0800 |
| commit | a3764e7da7ae2c30e2e1bbeaa0961a17bced2078 (patch) | |
| tree | 4cc71f632465d8043e6d523bdfe6837f7c4e1e42 /t/t7611-merge-abort.sh | |
| parent | Merge branch 'ew/connect-verbose' (diff) | |
| parent | convert: treat an empty string for clean/smudge filters as "cat" (diff) | |
| download | tgif-a3764e7da7ae2c30e2e1bbeaa0961a17bced2078.tar.xz | |
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"
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions