summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/doc-diff-options'Junio C Hamano2018-01-091-0/+6
|\
| * docs/diff-options: clarify scope of diff-filter typesjk/doc-diff-optionsJeff King2018-01-041-0/+6
* | diff: support anchoring line(s)jt/diff-anchored-patienceJonathan Tan2017-11-281-0/+10
* | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-271-0/+3
|\ \
| * | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-081-0/+3
* | | Merge branch 'cn/diff-indent-no-longer-is-experimental'Junio C Hamano2017-11-061-1/+6
|\ \ \
| * | | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimentalCarlos Martín Nieto2017-11-021-1/+6
| * | | Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano2017-08-231-9/+8
| |\ \ \
* | \ \ \ Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-261-5/+3
|\ \ \ \ \
| * | | | | diff: define block by number of alphanumeric charsjt/diff-color-move-fixJonathan Tan2017-08-161-5/+3
* | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-261-0/+36
|\ \ \ \ \ \ | |/ / / / /
| * | | | | diff: document the new --color-moved settingStefan Beller2017-06-301-0/+36
| | |_|/ / | |/| | |
* | | | | Merge branch 'ah/doc-wserrorhighlight'Junio C Hamano2017-08-111-9/+8
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlightAndreas Heiduk2017-07-251-9/+8
| | |/ | |/|
* | | diff-options doc: grammar fixas/diff-options-grammofixAnthony Sottile2017-07-311-1/+1
| |/ |/|
* | Documentation: improve description for core.quotePathah/doc-ls-files-quotepathAndreas Heiduk2017-03-021-4/+3
|/
* Merge branch 'rh/diff-orderfile-doc'Junio C Hamano2017-01-231-2/+32
|\
| * diff: document the format of the -O (diff.orderFile) filerh/diff-orderfile-docRichard Hansen2017-01-151-2/+32
* | diff: add interhunk context config optionvn/diff-ihc-configVegard Nossum2017-01-121-0/+2
|/
* Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-0/+8
|\
| * diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-241-0/+8
* | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-261-0/+2
|\ \ | |/ |/|
| * diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-041-0/+2
* | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-261-6/+1
|\ \
| * | blame: honor the diff heuristic options and configMichael Haggerty2016-09-191-7/+1
| * | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-191-4/+5
* | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-311-7/+10
* | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-311-0/+3
* | | Merge branch 'jc/doc-diff-filter-exclude'Junio C Hamano2016-07-251-0/+3
|\ \ \ | |/ / |/| |
| * | diff: document diff-filter exclusionjc/doc-diff-filter-excludeJunio C Hamano2016-07-141-0/+3
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-101-0/+7
|\ \ \
| * | | diff: disable compaction heuristic for nowjk/diff-compact-heuristicJunio C Hamano2016-06-101-0/+7
| * | | diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano2016-05-021-6/+0
| * | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-191-0/+6
| |/ /
* | | Documentation: fix linkgit referencesjc/linkgit-fixJunio C Hamano2016-05-091-1/+1
* | | Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano2016-05-021-1/+1
|\ \ \
| * | | git-format-patch.txt: don't show -s as shorthand for multiple optionses/format-patch-doc-hide-no-patchEric Sunshine2016-04-041-1/+1
| |/ /
| * | Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-161-1/+10
| |\ \
| * \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-051-2/+6
| |\ \ \
* | | | | Documentation: git diff --check detects conflict markersoa/doc-diff-checkOri Avtalion2016-03-291-2/+2
| |_|_|/ |/| | |
* | | | Documentation/diff: give --word-diff-regex=. examplemg/doc-word-diff-exampleMichael J Gruber2015-11-241-0/+3
* | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-111-0/+10
|\ \ \ \
| * | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-261-0/+10
* | | | | Merge branch 'mm/log-format-raw-doc'Junio C Hamano2015-06-011-1/+10
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-181-1/+10
| |/ / /
* | | | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-221-2/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | doc: convert AsciiDoc {?foo} to ifdef::foo[]jk/asciidoc-markup-fixJeff King2015-05-141-2/+6
| |/
* | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-2/+2
|/
* Documentation: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
* diff: add diff.orderfile configuration variableSamuel Bronson2013-12-181-0/+3
View Lorry Controller Status