diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:43 (GMT) |
| commit | 2a2dbd2770b4dbda59b5b22e19fac973d08d0864 (patch) | |
| tree | f59f00d92e92a4fc342779c0aa8e750aaef6a445 /config.c | |
| parent | 89cd2373ea914e9656f169b315c4d758dfdcf07e (diff) | |
| parent | 48672b3dc70e8f70291d974f0eb54cbac7f498e0 (diff) | |
| download | git-2a2dbd2770b4dbda59b5b22e19fac973d08d0864.zip git-2a2dbd2770b4dbda59b5b22e19fac973d08d0864.tar.gz git-2a2dbd2770b4dbda59b5b22e19fac973d08d0864.tar.bz2 | |
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
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions