| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'mp/diff-algo-config' | Junio C Hamano | 2013-02-17 | 1 | -0/+2 |
|\ |
|
| * | diff: Introduce --diff-algorithm command line option | Michal Privoznik | 2013-01-16 | 1 | -0/+2 |
* | | diff: add diff_line_prefix function | John Keeping | 2013-02-12 | 1 | -0/+3 |
|/ |
|
* | Move setup_diff_pager to libgit.a | Nguyễn Thái Ngọc Duy | 2012-10-29 | 1 | -0/+1 |
* | diff.c: mark a private file-scope symbol as static | Junio C Hamano | 2012-09-15 | 1 | -1/+0 |
* | Merge branch 'jk/maint-null-in-trees' | Junio C Hamano | 2012-08-27 | 1 | -0/+5 |
|\ |
|
| * | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 1 | -0/+5 |
* | | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 1 | -1/+1 |
|\ \ |
|
| * | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'lp/diffstat-with-graph' | Junio C Hamano | 2012-05-02 | 1 | -0/+1 |
|\ \ |
|
| * | | Add output_prefix_length to diff_options | Lucian Poston | 2012-04-16 | 1 | -0/+1 |
* | | | Merge branch 'jk/diff-no-rename-empty' | Junio C Hamano | 2012-04-16 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | teach diffcore-rename to optionally ignore empty content | Jeff King | 2012-03-23 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 2012-04-15 | 1 | -0/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanup | Junio C Hamano | 2012-02-19 | 1 | -0/+2 |
* | | | Merge branch 'jc/pickaxe-ignore-case' | Junio C Hamano | 2012-03-07 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | pickaxe: allow -i to search in patch case-insensitively | Junio C Hamano | 2012-02-28 | 1 | -0/+1 |
| |/ / |
|
* | | | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | 1 | -0/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | diff --stat: enable limiting of the graph part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+1 |
* | | | Use correct grammar in diffstat summary linend/diffstat-gramnum | Nguyễn Thái Ngọc Duy | 2012-02-03 | 1 | -0/+3 |
|/ / |
|
* | | pass struct commit to diff_tree_combined_merge() | René Scharfe | 2011-12-17 | 1 | -1/+2 |
* | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 | 1 | -1/+2 |
|/ |
|
* | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 1 | -0/+1 |
* | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | 1 | -2/+3 |
|\ |
|
| * | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 | 1 | -2/+3 |
* | | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | diff: introduce --stat-lines to limit the stat lines | Michael J Gruber | 2011-05-27 | 1 | -0/+1 |
* | | Merge branch 'jk/diff-not-so-quick' | Junio C Hamano | 2011-06-06 | 1 | -0/+2 |
|\ \ |
|
| * | | diff: futureproof "stop feeding the backend early" logic | Junio C Hamano | 2011-05-31 | 1 | -0/+2 |
* | | | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 | 1 | -1/+2 |
|\ \ \ |
|
| * | | | New --dirstat=lines mode, doing dirstat analysis based on diffstat | Johan Herland | 2011-04-29 | 1 | -0/+1 |
| * | | | Allow specifying --dirstat cut-off percentage as a floating point number | Johan Herland | 2011-04-29 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 | 1 | -4/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | diff: remove often unused parameters from diff_unmerge() | Junio C Hamano | 2011-04-23 | 1 | -4/+1 |
| * | | diff.c: return filepair from diff_unmerge() | Junio C Hamano | 2011-04-23 | 1 | -1/+1 |
* | | | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 | 1 | -0/+1 |
* | | | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 1 | -0/+2 |
* | | | | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 1 | -1/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | add inexact rename detection progress infrastructure | Jeff King | 2011-02-21 | 1 | -0/+1 |
| * | | | merge: improve inexact rename limit warning | Jeff King | 2011-02-21 | 1 | -1/+1 |
* | | | | Convert struct diff_options to use struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -3/+1 |
|/ / / |
|
* | | | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-26 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 | 1 | -0/+2 |
* | | | | git log/diff: add -G<regexp> that greps in the patch text | Junio C Hamano | 2010-08-31 | 1 | -0/+3 |
| |/ /
|/| | |
|
* | | | Merge branch 'mm/shortopt-detached' | Junio C Hamano | 2010-08-21 | 1 | -0/+7 |
|\ \ \ |
|
| * | | | diff: parse separate options like -S foo | Matthieu Moy | 2010-08-06 | 1 | -0/+7 |
| |/ / |
|
* | | | Merge branch 'jc/maint-follow-rename-fix' | Junio C Hamano | 2010-08-18 | 1 | -0/+3 |
|\ \ \ |
|
| * | | | diff --follow: do call diffcore_std() as necessary | Junio C Hamano | 2010-08-13 | 1 | -0/+3 |
| |/ / |
|
* | | | Submodules: Add the new "ignore" config option for diff and status | Jens Lehmann | 2010-08-09 | 1 | -0/+1 |
|/ / |
|