aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/diff-options.txt
AgeCommit message (Expand)AuthorFilesLines
2024-03-15diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer1-2/+3
2023-12-26doc: enforce placeholders in documentationJean-Noël Avila1-1/+1
2023-10-30Merge branch 'sn/typo-grammo-phraso-fixes'Junio C Hamano1-2/+2
2023-10-23Merge branch 'en/docfixes'Junio C Hamano1-1/+1
2023-10-09diff-merges: introduce '--dd' optionSergey Organov1-0/+5
2023-10-09diff-merges: improve --diff-merges documentationSergey Organov1-46/+54
2023-10-09documentation: wording improvementsElijah Newren1-1/+1
2023-10-05doc/diff-options: improve wording of the log.diffMerges mentionŠtěpán Němec1-3/+3
2023-10-05doc: fix some typos, grammar and wording issuesŠtěpán Němec1-1/+1
2023-09-18diff --stat: add config option to limit filename widthDragan Simic1-8/+9
2023-09-14Merge branch 'so/diff-doc-for-patch-update'Junio C Hamano1-7/+1
2023-09-06doc/diff-options: fix link to generating patch sectionSergey Organov1-7/+1
2023-06-13Merge branch 'jc/diff-s-with-other-options'Junio C Hamano1-2/+5
2023-05-05diff: fix interaction between the "-s" option and other optionsJunio C Hamano1-2/+5
2023-03-09diff: add --default-prefix optionJeff King1-0/+5
2023-01-13docs: link generating patch sectionsJohn Cai1-1/+7
2022-02-16Merge branch 'js/diff-filter-negation-fix'Junio C Hamano1-5/+2
2022-02-02show, log: provide a --remerge-diff capabilityElijah Newren1-1/+13
2022-01-28docs(diff): lose incorrect claim about `diff-files --diff-filter=A`Johannes Schindelin1-5/+2
2021-08-11Merge branch 'jn/log-m-does-not-imply-p'Junio C Hamano1-4/+4
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder1-4/+4
2021-07-15diffcore-rename: treat a rename_limit of 0 as unlimitedElijah Newren1-0/+1
2021-07-15doc: clarify documentation for rename/copy limitsElijah Newren1-5/+10
2021-06-14Merge branch 'so/log-m-implies-p'Junio C Hamano1-4/+4
2021-05-21diff-merges: let "-m" imply "-p"Sergey Organov1-4/+4
2021-04-30Merge branch 'ab/pathname-encoding-doc'Junio C Hamano1-1/+4
2021-04-20doc: clarify the filename encoding in git diffAndrey Bienkowski1-1/+4
2021-04-16doc/diff-options: document new --diff-merges featuresSergey Organov1-4/+11
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano1-0/+8
2021-02-05Merge branch 'so/log-diff-merge'Junio C Hamano1-0/+51
2020-12-21doc/git-show: include --diff-merges descriptionSergey Organov1-0/+51
2020-11-18Merge branch 'pb/blame-funcname-range-userdiff'Junio C Hamano1-1/+4
2020-11-11Merge branch 'jc/abbrev-doc'Junio C Hamano1-1/+2
2020-11-11Merge branch 'so/format-patch-doc-on-default-diff-format'Junio C Hamano1-3/+6
2020-11-04doc: clarify that --abbrev=<n> is about the minimum lengthJunio C Hamano1-1/+2
2020-11-02Merge branch 'mk/diff-ignore-regex'Junio C Hamano1-0/+5
2020-11-01doc: add more pointers to gitattributes(5) for userdiffPhilippe Blain1-1/+4
2020-10-31doc/diff-options: fix out of place mentions of '--patch/-p'Sergey Organov1-3/+6
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień1-0/+5
2020-08-31Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano1-4/+5
2020-08-21diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh1-4/+5
2020-07-29doc/git-log: move "-t" into diff-options listJeff King1-0/+5
2020-05-24diff: add config option relativeLaurent Arnoud1-1/+4
2020-02-09diff-options.txt: avoid "regex" overload in exampleMartin Ågren1-4/+4
2019-04-16Merge branch 'nd/diff-parseopt-3'Junio C Hamano1-1/+1
2019-03-07Merge branch 'nd/diff-parseopt-2'Junio C Hamano1-0/+20
2019-03-07Merge branch 'nd/diff-parseopt'Junio C Hamano1-1/+1
2019-03-07diff-parseopt: convert --binaryNguyễn Thái Ngọc Duy1-1/+1
2019-02-21diff-parseopt: convert --no-renames|--[no--rename-emptyNguyễn Thái Ngọc Duy1-0/+3
2019-02-21diff-parseopt: convert --output-*Nguyễn Thái Ngọc Duy1-0/+10
2019-02-21diff-parseopt: convert --dirstat and friendsNguyễn Thái Ngọc Duy1-0/+7
2019-01-29Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano1-2/+13
2019-01-27diff.c: convert -U|--unifiedNguyễn Thái Ngọc Duy1-1/+1
2019-01-10diff: allow --no-color-moved-wsPhillip Wood1-0/+7
2019-01-10Use "whitespace" consistentlyPhillip Wood1-2/+2
2019-01-10diff: document --no-color-movedPhillip Wood1-0/+4
2018-12-26log -G: ignore binary filesThomas Braun1-0/+5
2018-08-15Merge branch 'es/diff-color-moved-fix'Junio C Hamano1-1/+2
2018-08-02Merge branch 'sb/diff-color-move-more'Junio C Hamano1-2/+31
2018-07-25diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Eric Sunshine1-1/+2
2018-07-19diff.c: offer config option to control ws handling in move detectionStefan Beller1-2/+5
2018-07-19diff.c: add white space mode to move detection that allows indent changesStefan Beller1-0/+5
2018-07-17diff.c: decouple white space treatment from move detection algorithmStefan Beller1-0/+17
2018-07-17diff.c: add a blocks mode for moved code detectionStefan Beller1-2/+6
2018-06-19doc: fix typos in documentation and release notesKarthikeyan Singaravelan1-1/+1
2018-06-18Merge branch 'rd/diff-options-typofix'Junio C Hamano1-4/+4
2018-06-11diff-options.txt: fix minor typos, font inconsistencies, in docsRobert P. J. Day1-4/+4
2018-04-25Merge branch 'en/doc-typoes'Junio C Hamano1-2/+2
2018-04-09Documentation: fix several one-character-off spelling errorsElijah Newren1-2/+2
2018-03-14Merge branch 'nd/diff-stat-with-summary'Junio C Hamano1-0/+8
2018-02-27diff: add --compact-summaryNguyễn Thái Ngọc Duy1-0/+8
2018-01-23Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano1-0/+10
2018-01-09Merge branch 'jk/doc-diff-options'Junio C Hamano1-0/+6
2018-01-04diffcore: add a pickaxe option to find a specific blobStefan Beller1-0/+10
2018-01-04docs/diff-options: clarify scope of diff-filter typesJeff King1-0/+6
2017-11-28diff: support anchoring line(s)Jonathan Tan1-0/+10
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano1-0/+3
2017-11-15Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano1-1/+6
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano1-0/+3
2017-11-06Merge branch 'cn/diff-indent-no-longer-is-experimental'Junio C Hamano1-1/+6
2017-11-02diff: --indent-heuristic is no longer experimentalCarlos Martín Nieto1-1/+6
2017-08-26Merge branch 'jt/diff-color-move-fix'Junio C Hamano1-5/+3
2017-08-26Merge branch 'sb/diff-color-move'Junio C Hamano1-0/+36
2017-08-23Merge branch 'ah/doc-wserrorhighlight' into maintJunio C Hamano1-9/+8
2017-08-16diff: define block by number of alphanumeric charsJonathan Tan1-5/+3
2017-08-11Merge branch 'ah/doc-wserrorhighlight'Junio C Hamano1-9/+8
2017-07-31diff-options doc: grammar fixAnthony Sottile1-1/+1
2017-07-25doc: add missing values "none" and "default" for diff.wsErrorHighlightAndreas Heiduk1-9/+8
2017-06-30diff: document the new --color-moved settingStefan Beller1-0/+36
2017-03-02Documentation: improve description for core.quotePathAndreas Heiduk1-4/+3
2017-01-23Merge branch 'rh/diff-orderfile-doc'Junio C Hamano1-2/+32
2017-01-15diff: document the format of the -O (diff.orderFile) fileRichard Hansen1-2/+32
2017-01-12diff: add interhunk context config optionVegard Nossum1-0/+2
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano1-0/+8
2016-10-26Merge branch 'jc/ws-error-highlight'Junio C Hamano1-0/+2
2016-10-24diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy1-0/+8
2016-10-04diff: introduce diff.wsErrorHighlight optionJunio C Hamano1-0/+2
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano1-6/+1
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty1-7/+1
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty1-4/+5
2016-08-31diff: teach diff to display submodule difference with an inline diffJacob Keller1-7/+10
2016-08-31graph: add support for --line-prefix on all graph-aware outputJacob Keller1-0/+3
2016-07-25Merge branch 'jc/doc-diff-filter-exclude'Junio C Hamano1-0/+3
2016-07-14diff: document diff-filter exclusionJunio C Hamano1-0/+3
2016-06-10Merge branch 'jk/diff-compact-heuristic'Junio C Hamano1-0/+7
2016-06-10diff: disable compaction heuristic for nowJunio C Hamano1-0/+7
2016-05-09Documentation: fix linkgit referencesJunio C Hamano1-1/+1
2016-05-02Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano1-1/+1
2016-05-02diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano1-6/+0
2016-04-19xdiff: implement empty line chunk heuristicStefan Beller1-0/+6
2016-04-04git-format-patch.txt: don't show -s as shorthand for multiple optionsEric Sunshine1-1/+1
2016-03-29Documentation: git diff --check detects conflict markersOri Avtalion1-2/+2
2015-11-24Documentation/diff: give --word-diff-regex=. exampleMichael J Gruber1-0/+3
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano1-1/+10
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-0/+10
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano1-2/+6
2015-06-01Merge branch 'mm/log-format-raw-doc'Junio C Hamano1-1/+10
2015-05-26diff.c: --ws-error-highlight=<kind> optionJunio C Hamano1-0/+10
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano1-2/+6
2015-05-18Documentation/log: clarify what --raw meansMatthieu Moy1-1/+10
2015-05-14doc: convert AsciiDoc {?foo} to ifdef::foo[]Jeff King1-2/+6
2015-03-13*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy1-2/+2
2014-03-31Documentation: fix misuses of "nor"Justin Lebar1-1/+1
2013-12-18diff: add diff.orderfile configuration variableSamuel Bronson1-0/+3
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano1-0/+5
2013-07-17Documentation: move description of -s, --no-patch to diff-options.txtMatthieu Moy1-0/+5
2013-07-12Merge branch 'ft/diff-rename-default-score-is-half'Junio C Hamano1-1/+1
2013-07-05diff-options: document default similarity indexFraser Tweedale1-1/+1
2013-06-30Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano1-0/+3
2013-06-19diff: add --ignore-blank-lines optionAntoine Pelisse1-0/+3
2013-06-11Merge branch 'rr/diffcore-pickaxe-doc'Junio C Hamano1-8/+30
2013-06-03diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra1-8/+30
2013-05-28trivial: Add missing period in documentationPhil Hord1-1/+1
2013-03-25Merge branch 'maint-1.8.1' into maintJunio C Hamano1-2/+2
2013-03-25Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano1-2/+2
2013-03-19Merge branch 'jc/color-diff-doc'Junio C Hamano1-2/+2
2013-02-22diff-options: unconfuse description of --colorJunio C Hamano1-2/+2
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano1-0/+20
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-2/+2
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik1-0/+20
2012-12-18Sync with 'maint'Junio C Hamano1-1/+5
2012-12-18clarify -M without % symbol in diff-optionsSitaram Chamarty1-1/+5
2012-11-18diff: introduce diff.submodule configuration variableRamkumar Ramachandra1-1/+2
2012-06-22Documentation: Fix misspellingsLeila Muhtasib1-1/+1
2012-04-26docs: stop using asciidoc no-inline-literalJeff King1-1/+1
2012-03-15Merge branch 'th/doc-diff-submodule-option'Junio C Hamano1-5/+6
2012-03-14Documentation/diff-options: reword description of --submodule optionTim Henigan1-5/+6
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano1-6/+12
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano1-0/+3
2012-03-06Document the --histogram diff optionThomas Rast1-0/+3
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek1-7/+9
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek1-0/+2
2012-03-01diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek1-6/+8
2011-11-08Sync with 1.7.7.3Junio C Hamano1-0/+2
2011-11-08docs: don't mention --quiet or --exit-code in git-log(1)Jeff King1-0/+2
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano1-0/+4
2011-10-10diff: add option to show whole functions as contextRené Scharfe1-0/+4
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano1-0/+4
2011-07-06Merge branch 'maint'Junio C Hamano1-0/+11
2011-07-06docs: document --textconv diff optionJeff King1-0/+11
2011-06-29Merge branch 'mg/diff-stat-count'Junio C Hamano1-1/+7
2011-06-22Merge branch 'maint'Junio C Hamano1-4/+8
2011-06-22Documentation: git diff --check respects core.whitespaceChristof Krüger1-4/+8
2011-05-27diff-options.txt: describe --stat-{width,name-width,count}Michael J Gruber1-0/+3
2011-05-27diff: introduce --stat-lines to limit the stat linesMichael J Gruber1-1/+4
2011-05-26Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano1-4/+11
2011-05-13Merge branch 'jh/dirstat-lines'Junio C Hamano1-12/+42
2011-05-06Merge branch 'mg/diff-uiconfig-doc'Junio C Hamano1-4/+11
2011-05-06Merge branch 'maint'Junio C Hamano1-1/+1
2011-05-05Remove duplicated "is a"João Britto1-1/+1
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland1-0/+8
2011-04-29Add config variable for specifying default --dirstat behaviorJohan Herland1-0/+2
2011-04-29Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland1-12/+32
2011-04-28Merge branch 'jc/diff-irreversible-delete'Junio C Hamano1-0/+13
2011-04-27config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber1-4/+11
2011-04-11Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland1-2/+2
2011-04-11--dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland1-0/+4
2011-04-02git diff -D: omit the preimage of deletesJunio C Hamano1-0/+13
2010-12-10diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson1-3/+2
2010-11-29diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard1-0/+1
2010-11-17Merge branch 'maint'Junio C Hamano1-14/+12
2010-11-16Keep together options controlling the behaviour of diffcore-rename.Yann Dirson1-14/+12
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano1-0/+3
2010-10-21Sync with 1.7.3.2Junio C Hamano1-7/+7
2010-10-08Fix odd markup in --diff-filter documentationŠtěpán Němec1-2/+2
2010-10-08Use angles for placeholders consistentlyŠtěpán Němec1-5/+5
2010-09-29diff: add synonyms for -M, -C, -BKevin Ballard1-0/+3
2010-08-31git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano1-1/+5
2010-08-18Merge branch 'jl/submodule-ignore-diff'Junio C Hamano1-1/+5
2010-08-09Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CMatthieu Moy1-5/+30
2010-08-09Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann1-1/+1
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann1-1/+5
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano1-2/+8
2010-06-13Merge branch 'jk/diff-m-doc'Junio C Hamano1-0/+7
2010-06-11Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann1-2/+8
2010-05-21Merge branch 'tr/word-diff'Junio C Hamano1-4/+36
2010-05-18diff-options: make --patch a synonym for -pWill Palmer1-0/+1
2010-05-18docs: clarify meaning of -M for git-logJeff King1-0/+7
2010-04-18Merge branch 'maint'Junio C Hamano1-2/+2
2010-04-18Documentation: Describe other situations where -z affects git diffCharles Bailey1-2/+2
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-06 21:13:04 +0000