Merge branch 'cw/ws-indent-with-tab' into next
commit5b5e5797f3153ca83626fea519dc9b481c65c508
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Apr 2010 07:11:34 +0000 (5 00:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Apr 2010 07:11:34 +0000 (5 00:11 -0700)
tree435cbf2487a795a00263d582e0e973550c5d2f18
parent5ad036c869310afb16073036259ea14a903aa72c
parenta347b17f15dd5358ced8d447af144a46b224982d
Merge branch 'cw/ws-indent-with-tab' into next

* 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
Documentation/config.txt
builtin/apply.c
cache.h