aboutsummaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAge
* Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-16
|\
| * teach diffcore-rename to optionally ignore empty contentJeff King2012-03-23
* | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-15
|\ \ | |/ |/|
| * xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano2012-02-19
* | Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano2012-03-07
|\ \
| * | pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano2012-02-28
| |/
* | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-06
|\ \
| * | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-01
* | | Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy2012-02-03
|/ /
* | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-17
* | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-17
|/
* diff: add option to show whole functions as contextRené Scharfe2011-10-10
* Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-28
|\
| * diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-18
* | Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-29
|\ \ | |/ |/|
| * diff: introduce --stat-lines to limit the stat linesMichael J Gruber2011-05-27
* | Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-06
|\ \
| * | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-31
* | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-13
|\ \ \
| * | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-29
| * | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-29
| | |/ | |/|
* | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-06
|\ \ \ | |/ / |/| |
| * | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-23
| * | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-23
* | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-28
|\ \ \
| * | | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-02
* | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-22
* | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \ \ \ | |/ / / |/| | |
| * | | add inexact rename detection progress infrastructureJeff King2011-02-21
| * | | merge: improve inexact rename limit warningJeff King2011-02-21
* | | | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-03
|/ / /
* | | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-26
|\ \ \
| * | | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-29
* | | | git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano2010-08-31
| |/ / |/| |
* | | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-21
|\ \ \
| * | | diff: parse separate options like -S fooMatthieu Moy2010-08-06
| |/ /
* | | Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano2010-08-18
|\ \ \
| * | | diff --follow: do call diffcore_std() as necessaryJunio C Hamano2010-08-13
| |/ /
* | | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-09
|/ /
* | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-27
|\ \
| * | textconv: make the API publicAxel Bonnet2010-06-11
* | | Merge branch 'gv/portable'Junio C Hamano2010-06-21
|\ \ \
| * | | enums: omit trailing comma for portabilityGary V. Vaughan2010-05-31
* | | | Add a prefix output callback to diff outputBo Yang2010-05-31
| |/ / |/| |
* | | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-14
|/ /
* | git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-13
* | git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-08
* | Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-24
|\ \
| * | unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-07
* | | Performance optimization for detection of modified submodulesJens Lehmann2010-01-18