aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-config.txt
Commit message (Expand)AuthorAge
* Merge branch 'rh/diff-orderfile-doc'Junio C Hamano2017-01-23
|\
| * diff: document the format of the -O (diff.orderFile) fileRichard Hansen2017-01-15
| * diff: document behavior of relative diff.orderFileRichard Hansen2017-01-15
* | diff: add interhunk context config optionVegard Nossum2017-01-12
* | diff: retire "compaction" heuristicsJunio C Hamano2016-12-23
|/
* Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-26
|\
| * diff: introduce diff.wsErrorHighlight optionJunio C Hamano2016-10-04
* | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\ \
| * | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-19
* | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-31
* | | Merge branch 'mm/doc-tt'Junio C Hamano2016-07-13
|\ \ \ | |/ / |/| |
| * | doc: typeset short command-line options as literalMatthieu Moy2016-06-28
* | | Merge branch 'tr/doc-tt'Junio C Hamano2016-06-27
|\ \ \ | |/ /
| * | doc: change configuration variables formatTom Russello2016-06-08
| |/
* | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-10
|\ \
| * | diff: disable compaction heuristic for nowJunio C Hamano2016-06-10
| * | diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano2016-05-02
| * | xdiff: implement empty line chunk heuristicStefan Beller2016-04-19
| |/
* | diff: activate diff.renames by defaultMatthieu Moy2016-02-25
* | Documentation/diff-config: fix description of diff.renamesMatthieu Moy2016-02-25
|/
* *config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy2015-03-13
* Documentation: use "command-line" when used as a compound adjective, and fix ...Jason St. John2014-05-21
* diff: add diff.orderfile configuration variableSamuel Bronson2013-12-18
* Improve documentation concerning the status.submodulesummary settingJens Lehmann2013-09-11
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-17
|\
| * config: Introduce diff.algorithm variableMichal Privoznik2013-01-16
* | Merge branch 'da/mergetool-docs'Junio C Hamano2013-02-07
|\ \
| * | doc: generate a list of valid merge toolsDavid Aguilar2013-02-02
* | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01
| |/ |/|
* | Documentation/diff-config: work around AsciiDoc misfortuneJunio C Hamano2012-12-07
* | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-18
* | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-11-18
* | diff: diff.context configuration gives default to -UJeff Muizelaar2012-09-30
|/
* Documentation: spelling fixesMiklos Vajna2012-06-19
* diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek2012-03-01
* New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-29
* Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-29
* Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra2011-04-06
* Documentation: Add diff.<driver>.* to configRamkumar Ramachandra2011-04-06
* Documentation: Move diff.<driver>.* from config.txt to diff-config.txtRamkumar Ramachandra2011-04-06