summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
2019-06-13Merge branch 'sb/format-patch-base-patch-id-fix'Libravatar Junio C Hamano1-1/+2
2019-05-30Merge branch 'nd/diff-parseopt'Libravatar Junio C Hamano1-1/+1
2019-05-29diff-parseopt: correct variable types that are used by parseoptLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-05-08format-patch: make --base patch-id output stableLibravatar Stephen Boyd1-1/+2
2019-04-25Merge branch 'nd/diff-parseopt-4'Libravatar Junio C Hamano1-1/+4
2019-03-24am: avoid diff_opt_parse()Libravatar Nguyễn Thái Ngọc Duy1-0/+2
2019-03-24diff --no-index: use parse_options() instead of diff_opt_parse()Libravatar Nguyễn Thái Ngọc Duy1-1/+2
2019-03-07Merge branch 'jk/diff-no-index-initialize'Libravatar Junio C Hamano1-1/+1
2019-03-07Merge branch 'jk/unused-params'Libravatar Junio C Hamano1-1/+1
2019-03-07Merge branch 'en/combined-all-paths'Libravatar Junio C Hamano1-0/+1
2019-02-24diff: reuse diff setup for --no-index caseLibravatar Jeff King1-1/+1
2019-02-14diff: drop options parameter from diffcore_fix_diff_index()Libravatar Jeff King1-1/+1
2019-02-07log,diff-tree: add --combined-all-paths optionLibravatar Elijah Newren1-0/+1
2019-01-27diff.c: prepare to use parse_options() for parsingLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2019-01-27diff.h: avoid bit fields in struct diff_flagsLibravatar Nguyễn Thái Ngọc Duy1-33/+33
2019-01-27diff.h: keep forward struct declarations sortedLibravatar Nguyễn Thái Ngọc Duy1-6/+6
2019-01-14Merge branch 'sb/diff-color-moved-config-option-fixup'Libravatar Junio C Hamano1-1/+2
2018-11-14diff: align move detection error handling with other optionsLibravatar Stefan Beller1-1/+2
2018-11-12notes-cache.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12diff-lib.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-5/+17
2018-09-21userdiff.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-09-21diff.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-2/+5
2018-09-21diff.c: remove the_index dependency in textconv() functionsLibravatar Nguyễn Thái Ngọc Duy1-2/+7
2018-09-21diff.c: reduce implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-0/+3
2018-09-17Merge branch 'sb/range-diff-colors'Libravatar Junio C Hamano1-0/+5
2018-08-20diff.c: add --output-indicator-{new, old, context}Libravatar Stefan Beller1-0/+5
2018-08-20Merge branch 'js/range-diff'Libravatar Junio C Hamano1-1/+9
2018-08-13diff.c: move read_index() code back to the callerLibravatar Nguyễn Thái Ngọc Duy1-1/+0
2018-08-13range-diff: use dim/bold cues to improve dual color modeLibravatar Johannes Schindelin1-1/+7
2018-08-13diff: add an internal option to dual-color diffs of diffsLibravatar Johannes Schindelin1-0/+1
2018-08-13range-diff: suppress the diff headersLibravatar Johannes Schindelin1-0/+1
2018-08-03diff.h: remove extern from function declarationLibravatar Nguyễn Thái Ngọc Duy1-60/+60
2018-08-02Merge branch 'sb/diff-color-move-more'Libravatar Junio C Hamano1-2/+7
2018-07-19diff.c: add white space mode to move detection that allows indent changesLibravatar Stefan Beller1-0/+3
2018-07-17diff.c: decouple white space treatment from move detection algorithmLibravatar Stefan Beller1-0/+1
2018-07-17diff.c: add a blocks mode for moved code detectionLibravatar Stefan Beller1-2/+3
2018-05-08merge: add merge.renames config settingLibravatar Ben Peart1-0/+1
2018-03-14Merge branch 'nd/diff-stat-with-summary'Libravatar Junio C Hamano1-0/+1
2018-02-27diff: add --compact-summaryLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-01-23Merge branch 'sb/diff-blobfind-pickaxe'Libravatar Junio C Hamano1-2/+11
2018-01-04diffcore: add a pickaxe option to find a specific blobLibravatar Stefan Beller1-1/+7
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKLibravatar Stefan Beller1-0/+2
2018-01-04diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitLibravatar Stefan Beller1-1/+2
2018-01-04diff.h: make pickaxe_opts an unsigned bit fieldLibravatar Stefan Beller1-1/+1
2017-11-28diff: support anchoring line(s)Libravatar Jonathan Tan1-0/+4
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-39/+49
2017-11-06Merge branch 'jk/revision-pruning-optim'Libravatar Junio C Hamano1-0/+1
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-31/+31
2017-11-01diff: remove DIFF_OPT_CLR macroLibravatar Brandon Williams1-2/+0