summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* diff: clarify textconv interfacejk/more-comments-on-textconvJeff King2016-02-221-0/+16
* diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-271-1/+1
* Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-031-2/+9
|\
| * tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-071-0/+9
| * tree-diff: diff_tree() should now be staticKirill Smelkov2014-03-261-2/+0
* | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-071-2/+0
|\ \ | |/ |/|
| * diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletionJunio C Hamano2013-07-191-2/+0
* | combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-241-1/+0
* | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-271-1/+1
|\ \
| * | diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-121-1/+1
* | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-271-0/+2
|\ \ \
| * | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-061-0/+2
| |/ /
* | | Use the word 'stuck' instead of 'sticked'Nicolas Vigier2013-10-311-1/+1
|/ /
* | Merge branch 'mg/more-textconv'Junio C Hamano2013-10-231-2/+6
|\ \
| * | diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-101-2/+6
* | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-2/+1
|\ \ \ | |_|/ |/| |
| * | remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-151-2/+0
| * | move struct pathspec and related functions to pathspec.[ch]Nguyễn Thái Ngọc Duy2013-07-151-0/+1
| |/
* | diff: deprecate -q option to diff-filesjc/diff-filter-negationJunio C Hamano2013-07-191-0/+2
* | diff: preparse --diff-filter string argumentJunio C Hamano2013-07-171-1/+4
|/
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-171-0/+2
|\
| * diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-0/+2
* | diff: add diff_line_prefix functionJohn Keeping2013-02-121-0/+3
|/
* Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+1
* diff.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-1/+0
* Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-271-0/+5
|\
| * diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-0/+5
* | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-1/+1
|\ \
| * | diff_setup_done(): return voidThomas Rast2012-08-031-1/+1
| |/
* | Merge branch 'lp/diffstat-with-graph'Junio C Hamano2012-05-021-0/+1
|\ \
| * | Add output_prefix_length to diff_optionsLucian Poston2012-04-161-0/+1
* | | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-161-1/+1
|\ \ \
| * | | teach diffcore-rename to optionally ignore empty contentJeff King2012-03-231-1/+1
| |/ /
* | | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-151-0/+2
|\ \ \ | |/ / |/| |
| * | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-191-0/+2
* | | Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano2012-03-071-0/+1
|\ \ \
| * | | pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano2012-02-281-0/+1
| |/ /
* | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-061-0/+1
|\ \ \ | |_|/ |/| |
| * | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
* | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-031-0/+3
|/ /
* | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-171-1/+2
* | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-171-1/+2
|/
* diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+1
* Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-2/+3
|\
| * diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-181-2/+3
* | Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-291-0/+1
|\ \ | |/ |/|
| * diff: introduce --stat-lines to limit the stat linesMichael J Gruber2011-05-271-0/+1
* | Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-061-0/+2
|\ \
| * | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-311-0/+2
* | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-131-1/+2
|\ \ \
View Lorry Controller Status