summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* range-diff: suppress line count in outer diffThomas Gummerer2019-07-111-0/+1
* Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano2019-06-131-1/+2
|\
| * format-patch: make --base patch-id output stableStephen Boyd2019-05-081-1/+2
* | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-05-301-1/+1
|\ \ | |/ |/|
| * diff-parseopt: correct variable types that are used by parseoptNguyễn Thái Ngọc Duy2019-05-291-1/+1
* | Merge branch 'nd/diff-parseopt-4'Junio C Hamano2019-04-251-1/+4
|\ \
| * | am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-0/+2
| * | diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-1/+2
| |/
* | Merge branch 'jk/diff-no-index-initialize'Junio C Hamano2019-03-071-1/+1
|\ \
| * | diff: reuse diff setup for --no-index caseJeff King2019-02-241-1/+1
* | | Merge branch 'jk/unused-params'Junio C Hamano2019-03-071-1/+1
|\ \ \
| * | | diff: drop options parameter from diffcore_fix_diff_index()Jeff King2019-02-141-1/+1
* | | | Merge branch 'en/combined-all-paths'Junio C Hamano2019-03-071-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | log,diff-tree: add --combined-all-paths optionElijah Newren2019-02-071-0/+1
| |/ /
* | | diff.c: prepare to use parse_options() for parsingNguyễn Thái Ngọc Duy2019-01-271-0/+2
* | | diff.h: avoid bit fields in struct diff_flagsNguyễn Thái Ngọc Duy2019-01-271-33/+33
* | | diff.h: keep forward struct declarations sortedNguyễn Thái Ngọc Duy2019-01-271-6/+6
|/ /
* | Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano2019-01-141-1/+2
|\ \
| * | diff: align move detection error handling with other optionsStefan Beller2018-11-141-1/+2
| |/
* | notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+2
|/
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-5/+17
|\
| * userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+5
| * diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-2/+7
| * diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-0/+3
* | Merge branch 'sb/range-diff-colors'Junio C Hamano2018-09-171-0/+5
|\ \ | |/ |/|
| * diff.c: add --output-indicator-{new, old, context}Stefan Beller2018-08-201-0/+5
* | Merge branch 'js/range-diff'Junio C Hamano2018-08-201-1/+9
|\ \ | |/
| * range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin2018-08-131-1/+7
| * diff: add an internal option to dual-color diffs of diffsJohannes Schindelin2018-08-131-0/+1
| * range-diff: suppress the diff headersJohannes Schindelin2018-08-131-0/+1
* | diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy2018-08-131-1/+0
* | diff.h: remove extern from function declarationNguyễn Thái Ngọc Duy2018-08-031-60/+60
|/
* Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-08-021-2/+7
|\
| * diff.c: add white space mode to move detection that allows indent changesStefan Beller2018-07-191-0/+3
| * diff.c: decouple white space treatment from move detection algorithmStefan Beller2018-07-171-0/+1
| * diff.c: add a blocks mode for moved code detectionStefan Beller2018-07-171-2/+3
* | merge: add merge.renames config settingBen Peart2018-05-081-0/+1
|/
* Merge branch 'nd/diff-stat-with-summary'Junio C Hamano2018-03-141-0/+1
|\
| * diff: add --compact-summarynd/diff-stat-with-summaryNguyễn Thái Ngọc Duy2018-02-271-0/+1
* | Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano2018-01-231-2/+11
|\ \ | |/ |/|
| * diffcore: add a pickaxe option to find a specific blobStefan Beller2018-01-041-1/+7
| * diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller2018-01-041-0/+2
| * diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitStefan Beller2018-01-041-1/+2
| * diff.h: make pickaxe_opts an unsigned bit fieldStefan Beller2018-01-041-1/+1
* | diff: support anchoring line(s)jt/diff-anchored-patienceJonathan Tan2017-11-281-0/+4
|/
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-39/+49
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-31/+31
| * diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-2/+0
View Lorry Controller Status