Code

Merge branch 'cw/ws-indent-with-tab'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:35:35 +0000 (22:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:35:35 +0000 (22:35 -0700)
* 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

1  2 
Documentation/config.txt
builtin/apply.c
cache.h

Simple merge
diff --cc builtin/apply.c
Simple merge
diff --cc cache.h
Simple merge