summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
AgeCommit message (Expand)AuthorFilesLines
2016-05-02Merge branch 'es/format-patch-doc-hide-no-patch' into maintLibravatar Junio C Hamano1-1/+1
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
2013-07-05diff-options: document default similarity indexLibravatar Fraser Tweedale1-1/+1
2013-06-30Merge branch 'ap/diff-ignore-blank-lines'Libravatar Junio C Hamano1-0/+3
2013-06-19diff: add --ignore-blank-lines optionLibravatar Antoine Pelisse1-0/+3
2013-06-11Merge branch 'rr/diffcore-pickaxe-doc'Libravatar Junio C Hamano1-8/+30
2013-06-03diffcore-pickaxe doc: document -S and -G properlyLibravatar Ramkumar Ramachandra1-8/+30
2013-05-28trivial: Add missing period in documentationLibravatar Phil Hord1-1/+1
2013-03-25Merge branch 'maint-1.8.1' into maintLibravatar Junio C Hamano1-2/+2
2013-03-25Merge branch 'jc/color-diff-doc' into maint-1.8.1Libravatar Junio C Hamano1-2/+2
2013-03-19Merge branch 'jc/color-diff-doc'Libravatar Junio C Hamano1-2/+2
2013-02-22diff-options: unconfuse description of --colorLibravatar Junio C Hamano1-2/+2
2013-02-17Merge branch 'mp/diff-algo-config'Libravatar Junio C Hamano1-0/+20
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-2/+2
2013-01-16diff: Introduce --diff-algorithm command line optionLibravatar Michal Privoznik1-0/+20
2012-12-18Sync with 'maint'Libravatar Junio C Hamano1-1/+5
2012-12-18clarify -M without % symbol in diff-optionsLibravatar Sitaram Chamarty1-1/+5
2012-11-18diff: introduce diff.submodule configuration variableLibravatar Ramkumar Ramachandra1-1/+2
2012-06-22Documentation: Fix misspellingsLibravatar Leila Muhtasib1-1/+1
2012-04-26docs: stop using asciidoc no-inline-literalLibravatar Jeff King1-1/+1
2012-03-15Merge branch 'th/doc-diff-submodule-option'Libravatar Junio C Hamano1-5/+6
2012-03-14Documentation/diff-options: reword description of --submodule optionLibravatar Tim Henigan1-5/+6
2012-03-06Merge branch 'zj/diff-stat-dyncol'Libravatar Junio C Hamano1-6/+12
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Libravatar Junio C Hamano1-0/+3
2012-03-06Document the --histogram diff optionLibravatar Thomas Rast1-0/+3
2012-03-01diff --stat: add config option to limit graph widthLibravatar Zbigniew Jędrzejewski-Szmek1-7/+9
2012-03-01diff --stat: enable limiting of the graph partLibravatar Zbigniew Jędrzejewski-Szmek1-0/+2
2012-03-01diff --stat: use a maximum of 5/8 for the filename partLibravatar Zbigniew Jędrzejewski-Szmek1-6/+8
2011-11-08Sync with 1.7.7.3Libravatar Junio C Hamano1-0/+2
2011-11-08docs: don't mention --quiet or --exit-code in git-log(1)Libravatar Jeff King1-0/+2
2011-10-19Merge branch 'rs/diff-whole-function'Libravatar Junio C Hamano1-0/+4
2011-10-10diff: add option to show whole functions as contextLibravatar René Scharfe1-0/+4
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalLibravatar Junio C Hamano1-0/+4
2011-07-06Merge branch 'maint'Libravatar Junio C Hamano1-0/+11