summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
Commit message (Expand)AuthorAgeFilesLines
* diff: add --default-prefix optionJeff King2023-03-091-0/+5
* docs: link generating patch sectionsJohn Cai2023-01-131-1/+7
* Merge branch 'js/diff-filter-negation-fix'Junio C Hamano2022-02-161-5/+2
|\
| * docs(diff): lose incorrect claim about `diff-files --diff-filter=A`Johannes Schindelin2022-01-281-5/+2
* | show, log: provide a --remerge-diff capabilityElijah Newren2022-02-021-1/+13
|/
* Merge branch 'jn/log-m-does-not-imply-p'Junio C Hamano2021-08-111-4/+4
|\
| * Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder2021-08-091-4/+4
* | diffcore-rename: treat a rename_limit of 0 as unlimitedElijah Newren2021-07-151-0/+1
* | doc: clarify documentation for rename/copy limitsElijah Newren2021-07-151-5/+10
* | Merge branch 'so/log-m-implies-p'Junio C Hamano2021-06-141-4/+4
|\ \ | |/
| * diff-merges: let "-m" imply "-p"Sergey Organov2021-05-211-4/+4
* | Merge branch 'ab/pathname-encoding-doc'Junio C Hamano2021-04-301-1/+4
|\ \ | |/ |/|
| * doc: clarify the filename encoding in git diffAndrey Bienkowski2021-04-201-1/+4
* | doc/diff-options: document new --diff-merges featuresSergey Organov2021-04-161-4/+11
|/
* diff: --{rotate,skip}-to=<path>Junio C Hamano2021-02-161-0/+8
* Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-051-0/+51
|\
| * doc/git-show: include --diff-merges descriptionSergey Organov2020-12-211-0/+51
* | Merge branch 'pb/blame-funcname-range-userdiff'Junio C Hamano2020-11-181-1/+4
|\ \
| * | doc: add more pointers to gitattributes(5) for userdiffPhilippe Blain2020-11-011-1/+4
| |/
* | Merge branch 'jc/abbrev-doc'Junio C Hamano2020-11-111-1/+2
|\ \
| * | doc: clarify that --abbrev=<n> is about the minimum lengthJunio C Hamano2020-11-041-1/+2
| |/
* | Merge branch 'so/format-patch-doc-on-default-diff-format'Junio C Hamano2020-11-111-3/+6
|\ \
| * | doc/diff-options: fix out of place mentions of '--patch/-p'Sergey Organov2020-10-311-3/+6
| |/
* | Merge branch 'mk/diff-ignore-regex'Junio C Hamano2020-11-021-0/+5
|\ \ | |/ |/|
| * diff: add -I<regex> that ignores matching changesMichał Kępień2020-10-201-0/+5
* | Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano2020-08-311-4/+5
|\ \
| * | diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh2020-08-211-4/+5
| |/
* | doc/git-log: move "-t" into diff-options listJeff King2020-07-291-0/+5
|/
* diff: add config option relativeLaurent Arnoud2020-05-241-1/+4
* diff-options.txt: avoid "regex" overload in exampleMartin Ågren2020-02-091-4/+4
* Merge branch 'nd/diff-parseopt-3'Junio C Hamano2019-04-161-1/+1
|\
| * diff-parseopt: convert --binaryNguyễn Thái Ngọc Duy2019-03-071-1/+1
* | Merge branch 'nd/diff-parseopt-2'Junio C Hamano2019-03-071-0/+20
|\ \ | |/
| * diff-parseopt: convert --no-renames|--[no--rename-emptyNguyễn Thái Ngọc Duy2019-02-211-0/+3
| * diff-parseopt: convert --output-*Nguyễn Thái Ngọc Duy2019-02-211-0/+10
| * diff-parseopt: convert --dirstat and friendsNguyễn Thái Ngọc Duy2019-02-211-0/+7
* | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-03-071-1/+1
|\ \ | |/
| * diff.c: convert -U|--unifiedNguyễn Thái Ngọc Duy2019-01-271-1/+1
* | Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano2019-01-291-2/+13
|\ \ | |/ |/|
| * diff: allow --no-color-moved-wsPhillip Wood2019-01-101-0/+7
| * Use "whitespace" consistentlyPhillip Wood2019-01-101-2/+2
| * diff: document --no-color-movedPhillip Wood2019-01-101-0/+4
* | log -G: ignore binary filesThomas Braun2018-12-261-0/+5
|/
* Merge branch 'es/diff-color-moved-fix'Junio C Hamano2018-08-151-1/+2
|\
| * diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Eric Sunshine2018-07-251-1/+2
* | Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-08-021-2/+31
|\ \
| * | diff.c: offer config option to control ws handling in move detectionStefan Beller2018-07-191-2/+5
| * | diff.c: add white space mode to move detection that allows indent changesStefan Beller2018-07-191-0/+5
| * | diff.c: decouple white space treatment from move detection algorithmStefan Beller2018-07-171-0/+17
| * | diff.c: add a blocks mode for moved code detectionStefan Beller2018-07-171-2/+6