projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b42477 48672b3)
Merge branch 'rr/doc-content-type' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 18:59:39 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 18:59:39 +0000 (11:59 -0700)
commite596fd295fbb6e7453cd541554ba27ab185f870d
tree724b2b3c80a66d9ddd10b517278e0e77b20890e0tree | snapshot
parent5b42477b59886a85d4b49a60313f9b9d4a0d576fcommit | diff
parent48672b3dc70e8f70291d974f0eb54cbac7f498e0commit | diff
Merge branch 'rr/doc-content-type' into maint

* 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 | blob | history
Git—the stupid content tracker