diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:35:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:35:35 -0700 |
| commit | c58c5129d6f0a35ee62bcc0892209a2400e9f4e6 (patch) | |
| tree | 17afc52b50aa2f5a28c13afbe0fd0e21e813b22d /Documentation/howto/using-merge-subtree.txt | |
| parent | Merge branch 'cc/revert-strategy' (diff) | |
| parent | whitespace: tests for git-apply --whitespace=fix with tab-in-indent (diff) | |
| download | tgif-c58c5129d6f0a35ee62bcc0892209a2400e9f4e6.tar.xz | |
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
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions