summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-291-0/+1
| * | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-291-1/+1
| | |/ | |/|
* | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-061-4/+1
|\ \ \ | |/ / |/| |
| * | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-231-4/+1
| * | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-231-1/+1
* | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-281-0/+1
|\ \ \
| * | | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-021-0/+1
* | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-221-0/+2
* | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-191-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | add inexact rename detection progress infrastructureJeff King2011-02-211-0/+1
| * | | merge: improve inexact rename limit warningJeff King2011-02-211-1/+1
* | | | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-3/+1
|/ / /
* | | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-261-0/+2
|\ \ \
| * | | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-291-0/+2
* | | | git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano2010-08-311-0/+3
| |/ / |/| |
* | | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-211-0/+7
|\ \ \
| * | | diff: parse separate options like -S fooMatthieu Moy2010-08-061-0/+7
| |/ /
* | | Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano2010-08-181-0/+3
|\ \ \
| * | | diff --follow: do call diffcore_std() as necessaryJunio C Hamano2010-08-131-0/+3
| |/ /
* | | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-091-0/+1
|/ /
View Lorry Controller Status