| commit | 1d7aca4856fac26ae82d96bb335a51b33231e323 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:09 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:09 +0000 (4 17:50 -0700) | ||
| tree | dc9aa40d86f1235c6828b9f58582b91f2fe3294e | treesnapshot (tar.gz zip) |
| parent | 6d44a83e9e2fb4607917753fa74365c07c8ecf09 | commitdiff |
| parent | a347b17f15dd5358ced8d447af144a46b224982d | commitdiff |
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
* 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 | diff1 | diff2 | blobhistory |
| builtin/apply.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |