summaryrefslogtreecommitdiffstats
path: root/diff.h
AgeCommit message (Expand)AuthorLines
2016-07-29patch-ids: add flag to create the diff patch id using header only dataKevin Willford-1/+1
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano-0/+1
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano-2/+2
2016-02-26Merge branch 'jk/more-comments-on-textconv'Junio C Hamano-0/+16
2016-02-25diff: activate diff.renames by defaultMatthieu Moy-0/+1
2016-02-22diff: clarify textconv interfaceJeff King-0/+16
2016-02-19tree-diff: catch integer overflow in combine_diff_path allocationJeff King-2/+2
2016-02-05Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano-2/+2
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano-2/+2
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen-1/+1
2016-01-21diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy-1/+1
2016-01-04avoid shifting signed integers 31 bitsJeff King-1/+1
2015-07-09log: add "log.follow" configuration variableDavid Turner-0/+1
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano-1/+1
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano-0/+5
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King-1/+1
2015-05-26diff.c: --ws-error-highlight=<kind> optionJunio C Hamano-0/+5
2015-03-13diff: convert struct combine_diff_path to object_idbrian m. carlson-2/+3
2014-06-03Merge branch 'ks/tree-diff-nway'Junio C Hamano-2/+9
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov-0/+9
2014-03-26tree-diff: diff_tree() should now be staticKirill Smelkov-2/+0
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano-2/+0
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov-1/+0
2013-12-27Merge branch 'tg/diff-no-index-refactor'Junio C Hamano-1/+1
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano-0/+2
2013-12-12diff: move no-index detection to builtin/diff.cThomas Gummerer-1/+1
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger-0/+2
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier-1/+1
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano-2/+6
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano-2/+1
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano-2/+0
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano-0/+2
2013-07-17diff: preparse --diff-filter string argumentJunio C Hamano-1/+4
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy-2/+0
2013-07-15move struct pathspec and related functions to pathspec.[ch]Nguyễn Thái Ngọc Duy-0/+1
2013-05-10diff_opt: track whether flags have been set explicitlyJunio C Hamano-2/+6
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano-0/+2
2013-02-12diff: add diff_line_prefix functionJohn Keeping-0/+3
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik-0/+2
2012-10-29Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy-0/+1
2012-09-15diff.c: mark a private file-scope symbol as staticJunio C Hamano-1/+0
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano-0/+5
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano-1/+1
2012-08-03diff_setup_done(): return voidThomas Rast-1/+1
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King-0/+5
2012-05-02Merge branch 'lp/diffstat-with-graph'Junio C Hamano-0/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano-1/+1
2012-04-16Add output_prefix_length to diff_optionsLucian Poston-0/+1
2012-04-15Merge branch 'jc/diff-algo-cleanup'Junio C Hamano-0/+2
2012-03-23teach diffcore-rename to optionally ignore empty contentJeff King-1/+1