summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano2013-07-221-0/+5
|\
| * Documentation: move description of -s, --no-patch to diff-options.txtMatthieu Moy2013-07-171-0/+5
* | Merge branch 'ft/diff-rename-default-score-is-half'Junio C Hamano2013-07-121-1/+1
|\ \
| * | diff-options: document default similarity indexFraser Tweedale2013-07-051-1/+1
* | | Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano2013-06-301-0/+3
|\ \ \
| * | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-191-0/+3
| | |/ | |/|
* | | Merge branch 'rr/diffcore-pickaxe-doc'Junio C Hamano2013-06-111-8/+30
|\ \ \
| * | | diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra2013-06-031-8/+30
| |/ /
| * | Merge branch 'jc/color-diff-doc'Junio C Hamano2013-03-191-2/+2
| |\ \
* | | | trivial: Add missing period in documentationPhil Hord2013-05-281-1/+1
* | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-251-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano2013-03-251-2/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * diff-options: unconfuse description of --colorJunio C Hamano2013-02-221-2/+2
* | | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-171-0/+20
|\ \ \
| * | | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-0/+20
| |/ /
View Lorry Controller Status