Merge branch 'cw/ws-indent-with-tab'

* cw/ws-indent-with-tab:
whitespace: tests for git-apply --whitespace=fix with tab-in-indent
whitespace: add tab-in-indent support for --whitespace=fix
whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
whitespace: tests for git-diff --check with tab-in-indent error class
whitespace: add tab-in-indent error class
whitespace: we cannot "catch all errors known to git" anymore

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/apply.c
Simple merge

diff --cc cache.h
Simple merge