summaryrefslogtreecommitdiffstats
path: root/Documentation/diff-options.txt
AgeCommit message (Expand)AuthorLines
2018-01-09Merge branch 'jk/doc-diff-options'Junio C Hamano-0/+6
2018-01-04docs/diff-options: clarify scope of diff-filter typesJeff King-0/+6
2017-11-28diff: support anchoring line(s)Jonathan Tan-0/+10
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano-0/+3
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano-0/+3
2017-11-06Merge branch 'cn/diff-indent-no-longer-is-experimental'Junio C Hamano-1/+6
2017-11-02diff: --indent-heuristic is no longer experimentalCarlos Martín Nieto-1/+6
2017-08-26Merge branch 'jt/diff-color-move-fix'Junio C Hamano-5/+3
2017-08-26Merge branch 'sb/diff-color-move'Junio C Hamano-0/+36
2017-08-23Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano-9/+8
2017-08-16diff: define block by number of alphanumeric charsJonathan Tan-5/+3
2017-08-11Merge branch 'ah/doc-wserrorhighlight'Junio C Hamano-9/+8
2017-07-31diff-options doc: grammar fixAnthony Sottile-1/+1
2017-07-25doc: add missing values "none" and "default" for diff.wsErrorHighlightAndreas Heiduk-9/+8
2017-06-30diff: document the new --color-moved settingStefan Beller-0/+36
2017-03-02Documentation: improve description for core.quotePathAndreas Heiduk-4/+3
2017-01-23Merge branch 'rh/diff-orderfile-doc'Junio C Hamano-2/+32
2017-01-15diff: document the format of the -O (diff.orderFile) fileRichard Hansen-2/+32
2017-01-12diff: add interhunk context config optionVegard Nossum-0/+2
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano-0/+8
2016-10-26Merge branch 'jc/ws-error-highlight'Junio C Hamano-0/+2
2016-10-24diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy-0/+8
2016-10-04diff: introduce diff.wsErrorHighlight optionJunio C Hamano-0/+2
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano-6/+1
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty-7/+1
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty-4/+5
2016-08-31diff: teach diff to display submodule difference with an inline diffJacob Keller-7/+10
2016-08-31graph: add support for --line-prefix on all graph-aware outputJacob Keller-0/+3
2016-07-25Merge branch 'jc/doc-diff-filter-exclude'Junio C Hamano-0/+3
2016-07-14diff: document diff-filter exclusionJunio C Hamano-0/+3
2016-06-10Merge branch 'jk/diff-compact-heuristic'Junio C Hamano-0/+7
2016-06-10diff: disable compaction heuristic for nowJunio C Hamano-0/+7
2016-05-09Documentation: fix linkgit referencesJunio C Hamano-1/+1
2016-05-02Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano-1/+1
2016-05-02diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano-6/+0
2016-04-19xdiff: implement empty line chunk heuristicStefan Beller-0/+6
2016-04-04git-format-patch.txt: don't show -s as shorthand for multiple optionsEric Sunshine-1/+1
2016-03-29Documentation: git diff --check detects conflict markersOri Avtalion-2/+2
2015-11-24Documentation/diff: give --word-diff-regex=. exampleMichael J Gruber-0/+3
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano-1/+10
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano-0/+10
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano-2/+6
2015-06-01Merge branch 'mm/log-format-raw-doc'Junio C Hamano-1/+10
2015-05-26diff.c: --ws-error-highlight=<kind> optionJunio C Hamano-0/+10
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano-2/+6
2015-05-18Documentation/log: clarify what --raw meansMatthieu Moy-1/+10
2015-05-14doc: convert AsciiDoc {?foo} to ifdef::foo[]Jeff King-2/+6
2015-03-13*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy-2/+2
2014-03-31Documentation: fix misuses of "nor"Justin Lebar-1/+1
2013-12-18diff: add diff.orderfile configuration variableSamuel Bronson-0/+3