summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
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
2013-07-17diff: preparse --diff-filter string argumentLibravatar Junio C Hamano1-1/+4
2013-07-15remove diff_tree_{setup,release}_pathsLibravatar Nguyễn Thái Ngọc Duy1-2/+0
2013-07-15move struct pathspec and related functions to pathspec.[ch]Libravatar Nguyễn Thái Ngọc Duy1-0/+1
2013-05-10diff_opt: track whether flags have been set explicitlyLibravatar Junio C Hamano1-2/+6
2013-02-17Merge branch 'mp/diff-algo-config'Libravatar Junio C Hamano1-0/+2
2013-02-12diff: add diff_line_prefix functionLibravatar John Keeping1-0/+3
2013-01-16diff: Introduce --diff-algorithm command line optionLibravatar Michal Privoznik1-0/+2
2012-10-29Move setup_diff_pager to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2012-09-15diff.c: mark a private file-scope symbol as staticLibravatar Junio C Hamano1-1/+0
2012-08-27Merge branch 'jk/maint-null-in-trees'Libravatar Junio C Hamano1-0/+5
2012-08-22Merge branch 'tr/void-diff-setup-done'Libravatar Junio C Hamano1-1/+1
2012-08-03diff_setup_done(): return voidLibravatar Thomas Rast1-1/+1
2012-07-29diff: do not use null sha1 as a sentinel valueLibravatar Jeff King1-0/+5
2012-05-02Merge branch 'lp/diffstat-with-graph'Libravatar Junio C Hamano1-0/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Libravatar Junio C Hamano1-1/+1
2012-04-16Add output_prefix_length to diff_optionsLibravatar Lucian Poston1-0/+1
2012-04-15Merge branch 'jc/diff-algo-cleanup'Libravatar Junio C Hamano1-0/+2
2012-03-23teach diffcore-rename to optionally ignore empty contentLibravatar Jeff King1-1/+1
2012-03-07Merge branch 'jc/pickaxe-ignore-case'Libravatar Junio C Hamano1-0/+1
2012-03-06Merge branch 'zj/diff-stat-dyncol'Libravatar Junio C Hamano1-0/+1
2012-03-01diff --stat: enable limiting of the graph partLibravatar Zbigniew Jędrzejewski-Szmek1-0/+1
2012-02-28pickaxe: allow -i to search in patch case-insensitivelyLibravatar Junio C Hamano1-0/+1
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsLibravatar Junio C Hamano1-0/+2
2012-02-03Use correct grammar in diffstat summary lineLibravatar Nguyễn Thái Ngọc Duy1-0/+3
2011-12-17pass struct commit to diff_tree_combined_merge()Libravatar René Scharfe1-1/+2