| commit | dca8914d0db393b66c4028ae24094b97791829d1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Apr 2011 23:14:50 +0000 (11 16:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Apr 2011 23:14:50 +0000 (11 16:14 -0700) | ||
| tree | 9eed9750fb61a9812a448bf2fcc64a95f3b7ab27 | treesnapshot (tar.gz zip) |
| parent | 06480d1d4e87c4295d7654c3b82f70cf78f98bba | commitdiff |
| parent | 48672b3dc70e8f70291d974f0eb54cbac7f498e0 | commitdiff |
Merge branch 'rr/doc-content-type' into next
* rr/doc-content-type:
Documentation: Allow custom diff tools to be specified in 'diff.tool'
Documentation: Add diff.<driver>.* to config
Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
Documentation: Add filter.<driver>.* to config
* rr/doc-content-type:
Documentation: Allow custom diff tools to be specified in 'diff.tool'
Documentation: Add diff.<driver>.* to config
Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
Documentation: Add filter.<driver>.* to config
| Documentation/config.txt | diff1 | diff2 | blobhistory |