projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89cd237 48672b3)
Merge branch 'rr/doc-content-type'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:43 +0000 (11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:43 +0000 (11:36 -0700)
commit2a2dbd2770b4dbda59b5b22e19fac973d08d0864
treef59f00d92e92a4fc342779c0aa8e750aaef6a445tree | snapshot
parent89cd2373ea914e9656f169b315c4d758dfdcf07ecommit | diff
parent48672b3dc70e8f70291d974f0eb54cbac7f498e0commit | diff
Merge branch 'rr/doc-content-type'

* 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