summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
* | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-2/+2
|/ /
* | Sync with 'maint'Junio C Hamano2012-12-181-1/+5
|\ \
| * | clarify -M without % symbol in diff-optionsSitaram Chamarty2012-12-181-1/+5
| |/
* | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-181-1/+2
|/
* Documentation: Fix misspellingsLeila Muhtasib2012-06-221-1/+1
* docs: stop using asciidoc no-inline-literalJeff King2012-04-261-1/+1
* Merge branch 'th/doc-diff-submodule-option'Junio C Hamano2012-03-151-5/+6
|\
| * Documentation/diff-options: reword description of --submodule optionth/doc-diff-submodule-optionTim Henigan2012-03-141-5/+6
* | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-061-6/+12
|\ \
| * | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-7/+9
| * | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-011-0/+2
| * | diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek2012-03-011-6/+8
* | | Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano2012-03-061-0/+3
|\ \ \ | |/ / |/| |
| * | Document the --histogram diff optionThomas Rast2012-03-061-0/+3
* | | Sync with 1.7.7.3Junio C Hamano2011-11-081-0/+2
|\ \ \ | |/ /
View Lorry Controller Status