summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
2017-06-02diff: convert diff_flush_patch_id to struct object_idLibravatar Brandon Williams1-1/+1
2017-06-02diff: convert diff_change to struct object_idLibravatar Brandon Williams1-7/+6
2017-06-02diff: convert diff_addremove to struct object_idLibravatar Brandon Williams1-4/+4
2017-05-24blame: move textconv_object with related functionsLibravatar Jeff Smith1-0/+7
2017-05-08diff-lib: convert do_diff_cache to struct object_idLibravatar brian m. carlson1-1/+1
2017-03-31Rename sha1_array to oid_arrayLibravatar brian m. carlson1-2/+2
2016-10-27Merge branch 'nd/ita-empty-commit'Libravatar Junio C Hamano1-1/+2
2016-10-26diff_aligned_abbrev: use "struct oid"Libravatar Jeff King1-1/+1
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevLibravatar Jeff King1-1/+5
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Libravatar Nguyễn Thái Ngọc Duy1-0/+1
2016-09-26Merge branch 'mh/diff-indent-heuristic'Libravatar Junio C Hamano1-0/+1
2016-09-19blame: honor the diff heuristic options and configLibravatar Michael Haggerty1-0/+1
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Libravatar Junio C Hamano1-2/+9
2016-08-31diff: teach diff to display submodule difference with an inline diffLibravatar Jacob Keller1-1/+2
2016-08-31diff: prepare for additional submodule formatsLibravatar Jacob Keller1-1/+6
2016-08-31graph: add support for --line-prefix on all graph-aware outputLibravatar Jacob Keller1-0/+2
2016-08-31diff.c: remove output_prefix_length fieldLibravatar Junio C Hamano1-1/+0
2016-07-29patch-ids: add flag to create the diff patch id using header only dataLibravatar Kevin Willford1-1/+1
2016-04-03Merge branch 'mm/diff-renames-default'Libravatar Junio C Hamano1-0/+1
2016-02-26Merge branch 'jk/tighten-alloc'Libravatar Junio C Hamano1-2/+2
2016-02-26Merge branch 'jk/more-comments-on-textconv'Libravatar Junio C Hamano1-0/+16
2016-02-25diff: activate diff.renames by defaultLibravatar Matthieu Moy1-0/+1
2016-02-22diff: clarify textconv interfaceLibravatar Jeff King1-0/+16
2016-02-19tree-diff: catch integer overflow in combine_diff_path allocationLibravatar Jeff King1-2/+2
2016-02-05Merge branch 'nd/diff-with-path-params' into maintLibravatar Junio C Hamano1-2/+2
2016-02-03Merge branch 'nd/diff-with-path-params'Libravatar Junio C Hamano1-2/+2
2016-01-21diff: make -O and --output work in subdirectoryLibravatar Duy Nguyen1-1/+1
2016-01-21diff-no-index: do not take a redundant prefix argumentLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2016-01-04avoid shifting signed integers 31 bitsLibravatar Jeff King1-1/+1
2015-07-09log: add "log.follow" configuration variableLibravatar David Turner1-0/+1
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Libravatar Junio C Hamano1-1/+1
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Libravatar Junio C Hamano1-0/+5
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTLibravatar Jeff King1-1/+1
2015-05-26diff.c: --ws-error-highlight=<kind> optionLibravatar Junio C Hamano1-0/+5
2015-03-13diff: convert struct combine_diff_path to object_idLibravatar brian m. carlson1-2/+3
2014-06-03Merge branch 'ks/tree-diff-nway'Libravatar Junio C Hamano1-2/+9
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellLibravatar Kirill Smelkov1-0/+9
2014-03-26tree-diff: diff_tree() should now be staticLibravatar Kirill Smelkov1-2/+0
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Libravatar Junio C Hamano1-2/+0
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreLibravatar Kirill Smelkov1-1/+0
2013-12-27Merge branch 'tg/diff-no-index-refactor'Libravatar Junio C Hamano1-1/+1
2013-12-27Merge branch 'zk/difftool-counts'Libravatar Junio C Hamano1-0/+2
2013-12-12diff: move no-index detection to builtin/diff.cLibravatar Thomas Gummerer1-1/+1
2013-12-06difftool: display the number of files in the diff queue in the promptLibravatar Zoltan Klinger1-0/+2
2013-10-31Use the word 'stuck' instead of 'sticked'Libravatar Nicolas Vigier1-1/+1
2013-10-23Merge branch 'mg/more-textconv'Libravatar Junio C Hamano1-2/+6
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-2/+1
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureLibravatar Junio C Hamano1-2/+0
2013-07-19diff: deprecate -q option to diff-filesLibravatar Junio C Hamano1-0/+2