summaryrefslogtreecommitdiff
path: root/Documentation/diff-config.txt
Commit message (Expand)AuthorAgeFilesLines
* doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlightAndreas Heiduk2017-07-251-4/+7
* Merge branch 'rh/diff-orderfile-doc'Junio C Hamano2017-01-231-3/+4
|\
| * diff: document the format of the -O (diff.orderFile) filerh/diff-orderfile-docRichard Hansen2017-01-151-3/+2
| * diff: document behavior of relative diff.orderFileRichard Hansen2017-01-151-0/+2
* | diff: add interhunk context config optionvn/diff-ihc-configVegard Nossum2017-01-121-0/+6
* | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-231-4/+2
|/
* Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-261-0/+6
|\
| * diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-041-0/+6
* | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-261-3/+4
|\ \
| * | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-191-3/+4
* | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-311-4/+5
* | | Merge branch 'mm/doc-tt'Junio C Hamano2016-07-131-1/+1
|\ \ \ | |/ / |/| |
| * | doc: typeset short command-line options as literalMatthieu Moy2016-06-281-1/+1
* | | Merge branch 'tr/doc-tt'Junio C Hamano2016-06-271-1/+1
|\ \ \ | |/ /
| * | doc: change configuration variables formattr/doc-ttTom Russello2016-06-081-1/+1
| |/
* | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-101-0/+5
|\ \
| * | diff: disable compaction heuristic for nowjk/diff-compact-heuristicJunio C Hamano2016-06-101-0/+5
| * | diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano2016-05-021-5/+0
| * | xdiff: implement empty line chunk heuristicStefan Beller2016-04-191-0/+5
| |/
* | diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-251-1/+1
* | Documentation/diff-config: fix description of diff.renamesMatthieu Moy2016-02-251-3/+7
|/
* *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-5/+5
* Documentation: use "command-line" when used as a compound adjective, and fix ...jj/command-line-somethingjj/command-line-adjectiveJason St. John2014-05-211-1/+1
* diff: add diff.orderfile configuration variableSamuel Bronson2013-12-181-0/+5
* Improve documentation concerning the status.submodulesummary settingbc/submodule-status-ignoredJens Lehmann2013-09-111-1/+5
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-171-0/+17
|\
| * config: Introduce diff.algorithm variableMichal Privoznik2013-01-161-0/+17
* | Merge branch 'da/mergetool-docs'Junio C Hamano2013-02-071-6/+7
|\ \
| * | doc: generate a list of valid merge toolsDavid Aguilar2013-02-021-6/+7
* | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-1/+1
| |/ |/|
* | Documentation/diff-config: work around AsciiDoc misfortuneJunio C Hamano2012-12-071-2/+2
* | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-181-0/+7
* | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-11-181-0/+6
* | diff: diff.context configuration gives default to -UJeff Muizelaar2012-09-301-0/+4
|/
* Documentation: spelling fixesMiklos Vajna2012-06-191-1/+1
* diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-0/+4
* New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-291-0/+8
* Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-291-0/+36
* Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra2011-04-061-6/+8
* Documentation: Add diff.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+28
* Documentation: Move diff.<driver>.* from config.txt to diff-config.txtRamkumar Ramachandra2011-04-061-0/+62
View Lorry Controller Status