Merge branch 'cw/ws-indent-with-tab'
commitc58c5129d6f0a35ee62bcc0892209a2400e9f4e6
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:35:35 +0000 (8 22:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:35:35 +0000 (8 22:35 -0700)
tree17afc52b50aa2f5a28c13afbe0fd0e21e813b22d
parentf78eeeaf55a4f60a05d3e6452f29a2214c29b6fd
parenta347b17f15dd5358ced8d447af144a46b224982d
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
Documentation/config.txt
builtin/apply.c
cache.h