aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic1-0/+1
2023-08-21diff: drop useless "status" parameter from diff_result_code()Jeff King1-1/+1
2023-08-21diff: drop useless return from run_diff_{files,index} functionsJeff King1-2/+2
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-2/+5
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-2/+5
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren1-1/+3
2023-06-21diff.h: move declaration for global in diff.c from cache.hElijah Newren1-0/+2
2023-06-20Merge branch 'jk/log-follow-with-non-literal-pathspec'Junio C Hamano1-0/+7
2023-06-03diff: factor out --follow pathspec checkJeff King1-0/+7
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano1-1/+0
2023-04-24diff.h: reduce unnecessary includesElijah Newren1-1/+0
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-4/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-4/+1
2023-03-28post-cocci: adjust comments for recent repo_* migrationÆvar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "diff.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+0
2023-03-21Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano1-0/+2
2023-03-17Merge branch 'en/header-cleanup'Junio C Hamano1-2/+1
2023-03-09diff: factor out src/dst prefix setupJeff King1-0/+2
2023-02-27Merge branch 'jc/diff-algo-attribute'Junio C Hamano1-0/+1
2023-02-23diff.h: remove unnecessary include of object.hElijah Newren1-1/+0
2023-02-23object.h: stop depending on cache.h; make cache.h depend on object.hElijah Newren1-1/+1
2023-02-21diff: teach diff to read algorithm from diff driverJohn Cai1-0/+1
2022-12-19Merge branch 'rs/diff-parseopts'Junio C Hamano1-1/+1
2022-12-02diff: remove parseopts member from struct diff_optionsRené Scharfe1-1/+0
2022-12-02diff: factor out add_diff_options()René Scharfe1-0/+1
2022-10-24patch-id: use stable patch-id for rebasesJerry Zhang1-1/+1
2022-02-16Merge branch 'js/diff-filter-negation-fix'Junio C Hamano1-1/+1
2022-02-02diff: add ability to insert additional headers for pathsElijah Newren1-1/+2
2022-01-28diff-filter: be more careful when looking for negative bitsJohannes Schindelin1-1/+1
2021-05-11diff.h: move pickaxe fields together againÆvar Arnfjörð Bjarmason1-2/+1
2021-05-11pickaxe: die when --find-object and --pickaxe-all are combinedÆvar Arnfjörð Bjarmason1-0/+2
2021-05-11pickaxe: die when -G and --pickaxe-regex are combinedÆvar Arnfjörð Bjarmason1-0/+2
2021-02-25Merge branch 'jc/diffcore-rotate'Junio C Hamano1-0/+21
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano1-0/+21
2021-02-11diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason1-1/+14
2021-01-25Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano1-0/+1
2020-12-08diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain1-0/+1
2020-11-02Merge branch 'mk/diff-ignore-regex'Junio C Hamano1-0/+4
2020-11-02Merge branch 'dl/diff-merge-base'Junio C Hamano1-1/+6
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień1-0/+4
2020-10-05Merge branch 'so/combine-diff-simplify'Junio C Hamano1-3/+3
2020-09-29Merge branch 'tb/bloom-improvements'Junio C Hamano1-2/+0
2020-09-29diff: get rid of redundant 'dense' argumentSergey Organov1-3/+3
2020-09-20builtin/diff-index: learn --merge-baseDenton Liu1-0/+1
2020-09-20diff-lib: define diff_get_merge_base()Denton Liu1-0/+2
2020-09-20diff-lib: accept option flags in run_diff_index()Denton Liu1-1/+3
2020-09-17bloom/diff: properly short-circuit on max_changesDerrick Stolee1-2/+0
2020-09-08diff-lib: tighten show_interdiff()'s interfaceEric Sunshine1-1/+6
2020-09-08diff: move show_interdiff() from its own file to diff-libEric Sunshine1-0/+2
2020-06-08diff.h: drop diff_tree_oid() & friends' return valueSZEDER Gábor1-5/+5
2020-03-30diff: halt tree-diff early after max_changesDerrick Stolee1-0/+5
2019-12-16Merge branch 'hw/doc-in-header'Junio C Hamano1-0/+126
2019-11-18diff: move doc to diff.h and diffcore.hHeba Waly1-0/+126
2019-11-14diff: export diffstat interfaceDaniel Ferreira1-0/+20
2019-08-19patch-id: convert to use the_hash_algobrian m. carlson1-1/+1
2019-07-11range-diff: suppress line count in outer diffThomas Gummerer1-0/+1
2019-06-13Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano1-1/+2
2019-05-30Merge branch 'nd/diff-parseopt'Junio C Hamano1-1/+1
2019-05-29diff-parseopt: correct variable types that are used by parseoptNguyễn Thái Ngọc Duy1-1/+1
2019-05-08format-patch: make --base patch-id output stableStephen Boyd1-1/+2
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano1-1/+4
2019-03-24am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy1-0/+2
2019-03-24diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy1-1/+2
2019-03-07Merge branch 'jk/diff-no-index-initialize'Junio C Hamano1-1/+1
2019-03-07Merge branch 'jk/unused-params'Junio C Hamano1-1/+1
2019-03-07Merge branch 'en/combined-all-paths'Junio C Hamano1-0/+1
2019-02-24diff: reuse diff setup for --no-index caseJeff King1-1/+1
2019-02-14diff: drop options parameter from diffcore_fix_diff_index()Jeff King1-1/+1
2019-02-07log,diff-tree: add --combined-all-paths optionElijah Newren1-0/+1
2019-01-27diff.c: prepare to use parse_options() for parsingNguyễn Thái Ngọc Duy1-0/+2
2019-01-27diff.h: avoid bit fields in struct diff_flagsNguyễn Thái Ngọc Duy1-33/+33
2019-01-27diff.h: keep forward struct declarations sortedNguyễn Thái Ngọc Duy1-6/+6
2019-01-14Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano1-1/+2
2018-11-14diff: align move detection error handling with other optionsStefan Beller1-1/+2
2018-11-12notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-1/+1
2018-11-12diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-1/+2
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-5/+17
2018-09-21userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+2
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+5
2018-09-21diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy1-2/+7
2018-09-21diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy1-0/+3
2018-09-17Merge branch 'sb/range-diff-colors'Junio C Hamano1-0/+5
2018-08-20diff.c: add --output-indicator-{new, old, context}Stefan Beller1-0/+5
2018-08-20Merge branch 'js/range-diff'Junio C Hamano1-1/+9
2018-08-13diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy1-1/+0
2018-08-13range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin1-1/+7
2018-08-13diff: add an internal option to dual-color diffs of diffsJohannes Schindelin1-0/+1
2018-08-13range-diff: suppress the diff headersJohannes Schindelin1-0/+1
2018-08-03diff.h: remove extern from function declarationNguyễn Thái Ngọc Duy1-60/+60
2018-08-02Merge branch 'sb/diff-color-move-more'Junio C Hamano1-2/+7
2018-07-19diff.c: add white space mode to move detection that allows indent changesStefan Beller1-0/+3
2018-07-17diff.c: decouple white space treatment from move detection algorithmStefan Beller1-0/+1
2018-07-17diff.c: add a blocks mode for moved code detectionStefan Beller1-2/+3
2018-05-08merge: add merge.renames config settingBen Peart1-0/+1
2018-03-14Merge branch 'nd/diff-stat-with-summary'Junio C Hamano1-0/+1
2018-02-27diff: add --compact-summaryNguyễn Thái Ngọc Duy1-0/+1
2018-01-23Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano1-2/+11
2018-01-04diffcore: add a pickaxe option to find a specific blobStefan Beller1-1/+7
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller1-0/+2
2018-01-04diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitStefan Beller1-1/+2
2018-01-04diff.h: make pickaxe_opts an unsigned bit fieldStefan Beller1-1/+1
2017-11-28diff: support anchoring line(s)Jonathan Tan1-0/+4
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-39/+49
2017-11-06Merge branch 'jk/revision-pruning-optim'Junio C Hamano1-0/+1
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-31/+31
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams1-2/+0
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-1/+0
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams1-1/+0
2017-11-01diff: remove touched flagsBrandon Williams1-4/+2
2017-11-01diff: add flag to indicate textconv was set via cmdlineBrandon Williams1-0/+1
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams1-39/+54
2017-10-14revision: quit pruning diff more quickly when possibleJeff King1-0/+1
2017-08-16diff: define block by number of alphanumeric charsJonathan Tan1-1/+1
2017-06-30diff.c: add dimming to moved line detectionStefan Beller1-2/+7
2017-06-30diff.c: color moved lines differently, plain modeStefan Beller1-0/+1
2017-06-30diff.c: color moved lines differentlyStefan Beller1-1/+11
2017-06-30diff.c: buffer all output if asked toStefan Beller1-0/+2
2017-06-30diff.c: convert show_stats to use emit_diff_symbolStefan Beller1-2/+2
2017-06-30submodule.c: migrate diff output to use emit_diff_symbolStefan Beller1-0/+9
2017-06-30diff.c: migrate emit_line_checked to use emit_diff_symbolStefan Beller1-3/+3
2017-06-19Merge branch 'bw/object-id'Junio C Hamano1-19/+19
2017-06-05tree-diff: convert diff_tree_paths to struct object_idBrandon Williams1-2/+2
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams1-2/+3
2017-06-05Merge branch 'js/blame-lib'Junio C Hamano1-0/+7
2017-06-02tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams1-2/+2
2017-06-02combine-diff: convert diff_tree_combined to struct object_idBrandon Williams1-1/+1
2017-06-02diff: convert diff_flush_patch_id to struct object_idBrandon Williams1-1/+1
2017-06-02diff: convert diff_change to struct object_idBrandon Williams1-7/+6
2017-06-02diff: convert diff_addremove to struct object_idBrandon Williams1-4/+4
2017-05-24blame: move textconv_object with related functionsJeff Smith1-0/+7
2017-05-08diff-lib: convert do_diff_cache to struct object_idbrian m. carlson1-1/+1
2017-03-31Rename sha1_array to oid_arraybrian m. carlson1-2/+2
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano1-1/+2
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King1-1/+1
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King1-1/+5
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy1-1/+1
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy1-0/+1
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano1-0/+1
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty1-0/+1
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano1-2/+9
2016-08-31diff: teach diff to display submodule difference with an inline diffJacob Keller1-1/+2
2016-08-31diff: prepare for additional submodule formatsJacob Keller1-1/+6
2016-08-31graph: add support for --line-prefix on all graph-aware outputJacob Keller1-0/+2
2016-08-31diff.c: remove output_prefix_length fieldJunio C Hamano1-1/+0
2016-07-29patch-ids: add flag to create the diff patch id using header only dataKevin Willford1-1/+1
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano1-0/+1
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-2/+2
2016-02-26Merge branch 'jk/more-comments-on-textconv'Junio C Hamano1-0/+16
2016-02-25diff: activate diff.renames by defaultMatthieu Moy1-0/+1
2016-02-22diff: clarify textconv interfaceJeff King1-0/+16
2016-02-19tree-diff: catch integer overflow in combine_diff_path allocationJeff King1-2/+2
2016-02-05Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano1-2/+2
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano1-2/+2
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen1-1/+1
2016-01-21diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy1-1/+1
2016-01-04avoid shifting signed integers 31 bitsJeff King1-1/+1
2015-07-09log: add "log.follow" configuration variableDavid Turner1-0/+1
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano1-1/+1
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-0/+5
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King1-1/+1
2015-05-26diff.c: --ws-error-highlight=<kind> optionJunio C Hamano1-0/+5
2015-03-13diff: convert struct combine_diff_path to object_idbrian m. carlson1-2/+3
2014-06-03Merge branch 'ks/tree-diff-nway'Junio C Hamano1-2/+9
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov1-0/+9
2014-03-26tree-diff: diff_tree() should now be staticKirill Smelkov1-2/+0
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano1-2/+0
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov1-1/+0
2013-12-27Merge branch 'tg/diff-no-index-refactor'Junio C Hamano1-1/+1
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano1-0/+2
2013-12-12diff: move no-index detection to builtin/diff.cThomas Gummerer1-1/+1
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger1-0/+2
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier1-1/+1
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano1-2/+6
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-2/+1
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano1-2/+0
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano1-0/+2
2013-07-17diff: preparse --diff-filter string argumentJunio C Hamano1-1/+4
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy1-2/+0
2013-07-15move struct pathspec and related functions to pathspec.[ch]Nguyễn Thái Ngọc Duy1-0/+1
2013-05-10diff_opt: track whether flags have been set explicitlyJunio C Hamano1-2/+6
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano1-0/+2
2013-02-12diff: add diff_line_prefix functionJohn Keeping1-0/+3
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik1-0/+2
2012-10-29Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy1-0/+1
2012-09-15diff.c: mark a private file-scope symbol as staticJunio C Hamano1-1/+0
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano1-0/+5
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-1/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-1/+1
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-0/+5
2012-05-02Merge branch 'lp/diffstat-with-graph'Junio C Hamano1-0/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano1-1/+1
2012-04-16Add output_prefix_length to diff_optionsLucian Poston1-0/+1
2012-04-15Merge branch 'jc/diff-algo-cleanup'Junio C Hamano1-0/+2
2012-03-23teach diffcore-rename to optionally ignore empty contentJeff King1-1/+1
2012-03-07Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano1-0/+1
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano1-0/+1
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek1-0/+1
2012-02-28pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano1-0/+1
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano1-0/+2
2012-02-03Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy1-0/+3
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 10:54:32 +0000