summaryrefslogtreecommitdiffstats
path: root/Documentation/diff-options.txt
AgeCommit message (Expand)AuthorLines
2017-08-23Merge branch 'ah/doc-wserrorhighlight' into maintJunio 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-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
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano-0/+5
2013-07-17Documentation: move description of -s, --no-patch to diff-options.txtMatthieu Moy-0/+5
2013-07-12Merge branch 'ft/diff-rename-default-score-is-half'Junio C Hamano-1/+1
2013-07-05diff-options: document default similarity indexFraser Tweedale-1/+1
2013-06-30Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano-0/+3
2013-06-19diff: add --ignore-blank-lines optionAntoine Pelisse-0/+3
2013-06-11Merge branch 'rr/diffcore-pickaxe-doc'Junio C Hamano-8/+30
2013-06-03diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra-8/+30
2013-05-28trivial: Add missing period in documentationPhil Hord-1/+1
2013-03-25Merge branch 'maint-1.8.1' into maintJunio C Hamano-2/+2
2013-03-25Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano-2/+2
2013-03-19Merge branch 'jc/color-diff-doc'Junio C Hamano-2/+2