aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
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
2011-12-17pass struct commit to diff_tree_combined_merge()René Scharfe1-1/+2
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-1/+2
2011-10-10diff: add option to show whole functions as contextRené Scharfe1-0/+1
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-2/+3
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-2/+3
2011-06-29Merge branch 'mg/diff-stat-count'Junio C Hamano1-0/+1
2011-06-06Merge branch 'jk/diff-not-so-quick'Junio C Hamano1-0/+2
2011-05-31diff: futureproof "stop feeding the backend early" logicJunio C Hamano1-0/+2
2011-05-27diff: introduce --stat-lines to limit the stat linesMichael J Gruber1-0/+1
2011-05-13Merge branch 'jh/dirstat-lines'Junio C Hamano1-1/+2
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano1-4/+1
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland1-0/+1
2011-04-29Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland1-1/+1
2011-04-28Merge branch 'jc/diff-irreversible-delete'Junio C Hamano1-0/+1
2011-04-23diff: remove often unused parameters from diff_unmerge()Junio C Hamano1-4/+1
2011-04-23diff.c: return filepair from diff_unmerge()Junio C Hamano1-1/+1
2011-04-02git diff -D: omit the preimage of deletesJunio C Hamano1-0/+1
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano1-0/+2
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano1-1/+2
2011-02-21add inexact rename detection progress infrastructureJeff King1-0/+1
2011-02-21merge: improve inexact rename limit warningJeff King1-1/+1
2011-02-03Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy1-3/+1
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano1-0/+2
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard1-0/+2
2010-08-31git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano1-0/+3
2010-08-21Merge branch 'mm/shortopt-detached'Junio C Hamano1-0/+7
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano1-0/+3
2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano1-0/+3
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann1-0/+1
2010-08-06diff: parse separate options like -S fooMatthieu Moy1-0/+7
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano1-0/+9
2010-06-21Merge branch 'gv/portable'Junio C Hamano1-1/+1
2010-06-11textconv: make the API publicAxel Bonnet1-0/+8
2010-05-31Add a prefix output callback to diff outputBo Yang1-0/+5
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan1-1/+1
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast1-1/+9
2010-03-13git status: ignoring untracked files must apply to submodules tooJens Lehmann1-0/+1
2010-03-08git status: Show detailed dirty status of submodules in long formatJens Lehmann1-0/+1
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano1-0/+1
2010-01-18Performance optimization for detection of modified submodulesJens Lehmann1-4/+6
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano1-0/+1
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano1-2/+2
2009-11-28Give the hunk comment its own colorBert Wesarg1-0/+1
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin1-0/+3
2009-07-29diff: Rename QUIET internal option to QUICKJunio C Hamano1-1/+1
2009-07-29diff: change semantics of "ignore whitespace" optionsJunio C Hamano1-0/+1
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio1-0/+3
2009-02-10Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer1-0/+2
2009-01-17color-words: take an optional regular expression describing wordsJohannes Schindelin1-0/+1
2008-12-29diff: add option to show context between close hunksRené Scharfe1-0/+1
2008-10-26userdiff: require explicitly allowing textconvJeff King1-0/+1
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-08 02:44:58 +0000