summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
AgeCommit message (Expand)AuthorFilesLines
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Libravatar Junio C Hamano1-0/+3
2017-11-08diff: --ignore-cr-at-eolLibravatar Junio C Hamano1-0/+3
2017-11-06Merge branch 'cn/diff-indent-no-longer-is-experimental'Libravatar Junio C Hamano1-1/+6
2017-11-02diff: --indent-heuristic is no longer experimentalLibravatar Carlos Martín Nieto1-1/+6
2017-08-26Merge branch 'jt/diff-color-move-fix'Libravatar Junio C Hamano1-5/+3
2017-08-26Merge branch 'sb/diff-color-move'Libravatar Junio C Hamano1-0/+36
2017-08-23Merge branch 'ah/doc-wserrorhighlight' into maintLibravatar Junio C Hamano1-9/+8
2017-08-16diff: define block by number of alphanumeric charsLibravatar Jonathan Tan1-5/+3
2017-08-11Merge branch 'ah/doc-wserrorhighlight'Libravatar Junio C Hamano1-9/+8
2017-07-31diff-options doc: grammar fixLibravatar Anthony Sottile1-1/+1
2017-07-25doc: add missing values "none" and "default" for diff.wsErrorHighlightLibravatar Andreas Heiduk1-9/+8
2017-06-30diff: document the new --color-moved settingLibravatar Stefan Beller1-0/+36
2017-03-02Documentation: improve description for core.quotePathLibravatar Andreas Heiduk1-4/+3
2017-01-23Merge branch 'rh/diff-orderfile-doc'Libravatar Junio C Hamano1-2/+32
2017-01-15diff: document the format of the -O (diff.orderFile) fileLibravatar Richard Hansen1-2/+32
2017-01-12diff: add interhunk context config optionLibravatar Vegard Nossum1-0/+2
2016-10-27Merge branch 'nd/ita-empty-commit'Libravatar Junio C Hamano1-0/+8
2016-10-26Merge branch 'jc/ws-error-highlight'Libravatar Junio C Hamano1-0/+2
2016-10-24diff: add --ita-[in]visible-in-indexLibravatar Nguyễn Thái Ngọc Duy1-0/+8
2016-10-04diff: introduce diff.wsErrorHighlight optionLibravatar Junio C Hamano1-0/+2
2016-09-26Merge branch 'mh/diff-indent-heuristic'Libravatar Junio C Hamano1-6/+1
2016-09-19blame: honor the diff heuristic options and configLibravatar Michael Haggerty1-7/+1
2016-09-19diff: improve positioning of add/delete blocks in diffsLibravatar Michael Haggerty1-4/+5
2016-08-31diff: teach diff to display submodule difference with an inline diffLibravatar Jacob Keller1-7/+10
2016-08-31graph: add support for --line-prefix on all graph-aware outputLibravatar Jacob Keller1-0/+3
2016-07-25Merge branch 'jc/doc-diff-filter-exclude'Libravatar Junio C Hamano1-0/+3
2016-07-14diff: document diff-filter exclusionLibravatar Junio C Hamano1-0/+3
2016-06-10Merge branch 'jk/diff-compact-heuristic'Libravatar Junio C Hamano1-0/+7
2016-06-10diff: disable compaction heuristic for nowLibravatar Junio C Hamano1-0/+7
2016-05-09Documentation: fix linkgit referencesLibravatar Junio C Hamano1-1/+1
2016-05-02Merge branch 'es/format-patch-doc-hide-no-patch' into maintLibravatar Junio C Hamano1-1/+1
2016-05-02diff: undocument the compaction heuristic knobs for experimentationLibravatar Junio C Hamano1-6/+0
2016-04-19xdiff: implement empty line chunk heuristicLibravatar Stefan Beller1-0/+6
2016-04-04git-format-patch.txt: don't show -s as shorthand for multiple optionsLibravatar Eric Sunshine1-1/+1
2016-03-29Documentation: git diff --check detects conflict markersLibravatar Ori Avtalion1-2/+2
2015-11-24Documentation/diff: give --word-diff-regex=. exampleLibravatar Michael J Gruber1-0/+3
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintLibravatar Junio C Hamano1-1/+10
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Libravatar Junio C Hamano1-0/+10
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintLibravatar Junio C Hamano1-2/+6
2015-06-01Merge branch 'mm/log-format-raw-doc'Libravatar Junio C Hamano1-1/+10
2015-05-26diff.c: --ws-error-highlight=<kind> optionLibravatar Junio C Hamano1-0/+10
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Libravatar Junio C Hamano1-2/+6
2015-05-18Documentation/log: clarify what --raw meansLibravatar Matthieu Moy1-1/+10
2015-05-14doc: convert AsciiDoc {?foo} to ifdef::foo[]Libravatar Jeff King1-2/+6
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2014-03-31Documentation: fix misuses of "nor"Libravatar Justin Lebar1-1/+1
2013-12-18diff: add diff.orderfile configuration variableLibravatar Samuel Bronson1-0/+3
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Libravatar Junio C Hamano1-0/+5
2013-07-17Documentation: move description of -s, --no-patch to diff-options.txtLibravatar Matthieu Moy1-0/+5
2013-07-12Merge branch 'ft/diff-rename-default-score-is-half'Libravatar Junio C Hamano1-1/+1