summaryrefslogtreecommitdiff
path: root/Documentation/diff-config.txt
AgeCommit message (Expand)AuthorFilesLines
2018-08-21generate-cmdlist.sh: collect config from all config.txt filesLibravatar Nguyễn Thái Ngọc Duy1-0/+12
2018-05-08merge: update documentation for {merge,diff}.renameLimitLibravatar Ben Peart1-1/+2
2017-07-25doc: add missing values "none" and "default" for diff.wsErrorHighlightLibravatar Andreas Heiduk1-4/+7
2017-01-23Merge branch 'rh/diff-orderfile-doc'Libravatar Junio C Hamano1-3/+4
2017-01-15diff: document the format of the -O (diff.orderFile) fileLibravatar Richard Hansen1-3/+2
2017-01-15diff: document behavior of relative diff.orderFileLibravatar Richard Hansen1-0/+2
2017-01-12diff: add interhunk context config optionLibravatar Vegard Nossum1-0/+6
2016-12-23diff: retire "compaction" heuristicsLibravatar Junio C Hamano1-4/+2
2016-10-26Merge branch 'jc/ws-error-highlight'Libravatar Junio C Hamano1-0/+6
2016-10-04diff: introduce diff.wsErrorHighlight optionLibravatar Junio C Hamano1-0/+6
2016-09-26Merge branch 'mh/diff-indent-heuristic'Libravatar Junio C Hamano1-3/+4
2016-09-19diff: improve positioning of add/delete blocks in diffsLibravatar Michael Haggerty1-3/+4
2016-08-31diff: teach diff to display submodule difference with an inline diffLibravatar Jacob Keller1-4/+5
2016-07-13Merge branch 'mm/doc-tt'Libravatar Junio C Hamano1-1/+1
2016-06-28doc: typeset short command-line options as literalLibravatar Matthieu Moy1-1/+1
2016-06-27Merge branch 'tr/doc-tt'Libravatar Junio C Hamano1-1/+1
2016-06-10Merge branch 'jk/diff-compact-heuristic'Libravatar Junio C Hamano1-0/+5
2016-06-10diff: disable compaction heuristic for nowLibravatar Junio C Hamano1-0/+5
2016-06-08doc: change configuration variables formatLibravatar Tom Russello1-1/+1
2016-05-02diff: undocument the compaction heuristic knobs for experimentationLibravatar Junio C Hamano1-5/+0
2016-04-19xdiff: implement empty line chunk heuristicLibravatar Stefan Beller1-0/+5
2016-02-25diff: activate diff.renames by defaultLibravatar Matthieu Moy1-1/+1
2016-02-25Documentation/diff-config: fix description of diff.renamesLibravatar Matthieu Moy1-3/+7
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-5/+5
2014-05-21Documentation: use "command-line" when used as a compound adjective, and fix ...Libravatar Jason St. John1-1/+1
2013-12-18diff: add diff.orderfile configuration variableLibravatar Samuel Bronson1-0/+5
2013-09-11Improve documentation concerning the status.submodulesummary settingLibravatar Jens Lehmann1-1/+5
2013-02-17Merge branch 'mp/diff-algo-config'Libravatar Junio C Hamano1-0/+17
2013-02-07Merge branch 'da/mergetool-docs'Libravatar Junio C Hamano1-6/+7
2013-02-02doc: generate a list of valid merge toolsLibravatar David Aguilar1-6/+7
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-1/+1
2013-01-16config: Introduce diff.algorithm variableLibravatar Michal Privoznik1-0/+17
2012-12-07Documentation/diff-config: work around AsciiDoc misfortuneLibravatar Junio C Hamano1-2/+2
2012-11-18diff: introduce diff.submodule configuration variableLibravatar Ramkumar Ramachandra1-0/+7
2012-11-18Documentation: move diff.wordRegex from config.txt to diff-config.txtLibravatar Ramkumar Ramachandra1-0/+6
2012-09-30diff: diff.context configuration gives default to -ULibravatar Jeff Muizelaar1-0/+4
2012-06-19Documentation: spelling fixesLibravatar Miklos Vajna1-1/+1
2012-03-01diff --stat: add config option to limit graph widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+4
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatLibravatar Johan Herland1-0/+8
2011-04-29Add config variable for specifying default --dirstat behaviorLibravatar Johan Herland1-0/+36
2011-04-06Documentation: Allow custom diff tools to be specified in 'diff.tool'Libravatar Ramkumar Ramachandra1-6/+8
2011-04-06Documentation: Add diff.<driver>.* to configLibravatar Ramkumar Ramachandra1-0/+28
2011-04-06Documentation: Move diff.<driver>.* from config.txt to diff-config.txtLibravatar Ramkumar Ramachandra1-0/+62