projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
Git—the stupid content tracker