summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)Author
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano
2016-09-01diff: teach diff to display submodule difference with an inline diffJacob Keller
2016-09-01diff: prepare for additional submodule formatsJacob Keller
2016-09-01graph: add support for --line-prefix on all graph-aware outputJacob Keller
2016-09-01diff.c: remove output_prefix_length fieldJunio C Hamano
2016-07-29patch-ids: add flag to create the diff patch id using header only dataKevin Willford
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano
2016-02-26Merge branch 'jk/more-comments-on-textconv'Junio C Hamano
2016-02-25diff: activate diff.renames by defaultMatthieu Moy
2016-02-22diff: clarify textconv interfaceJeff King
2016-02-19tree-diff: catch integer overflow in combine_diff_path allocationJeff King
2016-02-05Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen
2016-01-21diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy
2016-01-04avoid shifting signed integers 31 bitsJeff King
2015-07-09log: add "log.follow" configuration variableDavid Turner
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King
2015-05-27diff.c: --ws-error-highlight=<kind> optionJunio C Hamano
2015-03-14diff: convert struct combine_diff_path to object_idbrian m. carlson
2014-06-03Merge branch 'ks/tree-diff-nway'Junio C Hamano
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov
2014-03-26tree-diff: diff_tree() should now be staticKirill Smelkov
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov
2013-12-27Merge branch 'tg/diff-no-index-refactor'Junio C Hamano
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano
2013-12-12diff: move no-index detection to builtin/diff.cThomas Gummerer
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano
2013-07-17diff: preparse --diff-filter string argumentJunio C Hamano
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy
2013-07-15move struct pathspec and related functions to pathspec.[ch]Nguyễn Thái Ngọc Duy
2013-05-10diff_opt: track whether flags have been set explicitlyJunio C Hamano
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano
2013-02-12diff: add diff_line_prefix functionJohn Keeping