| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 | 1 | -1/+1 |
|\ |
|
| * | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-context | Jeff King | 2015-05-27 | 1 | -1/+1 |
* | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | 1 | -0/+5 |
|\ \ |
|
| * | | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-26 | 1 | -0/+5 |
| |/ |
|
* | | diff: convert struct combine_diff_path to object_id | brian m. carlson | 2015-03-13 | 1 | -2/+3 |
|/ |
|
* | Merge branch 'ks/tree-diff-nway' | Junio C Hamano | 2014-06-03 | 1 | -2/+9 |
|\ |
|
| * | tree-diff: rework diff_tree() to generate diffs for multiparent cases as well | Kirill Smelkov | 2014-04-07 | 1 | -0/+9 |
| * | tree-diff: diff_tree() should now be static | Kirill Smelkov | 2014-03-26 | 1 | -2/+0 |
* | | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion' | Junio C Hamano | 2014-03-07 | 1 | -2/+0 |
|\ \
| |/
|/| |
|
| * | diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletion | Junio C Hamano | 2013-07-19 | 1 | -2/+0 |
* | | combine-diff: combine_diff_path.len is not needed anymore | Kirill Smelkov | 2014-02-24 | 1 | -1/+0 |
* | | Merge branch 'tg/diff-no-index-refactor' | Junio C Hamano | 2013-12-27 | 1 | -1/+1 |
|\ \ |
|
| * | | diff: move no-index detection to builtin/diff.c | Thomas Gummerer | 2013-12-12 | 1 | -1/+1 |
* | | | Merge branch 'zk/difftool-counts' | Junio C Hamano | 2013-12-27 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | difftool: display the number of files in the diff queue in the prompt | Zoltan Klinger | 2013-12-06 | 1 | -0/+2 |
| |/ / |
|
* | | | Use the word 'stuck' instead of 'sticked' | Nicolas Vigier | 2013-10-31 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'mg/more-textconv' | Junio C Hamano | 2013-10-23 | 1 | -2/+6 |
|\ \ |
|
| * | | diff_opt: track whether flags have been set explicitly | Junio C Hamano | 2013-05-10 | 1 | -2/+6 |
* | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 | 1 | -2/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | remove diff_tree_{setup,release}_paths | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -2/+0 |
| * | | move struct pathspec and related functions to pathspec.[ch] | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -0/+1 |
| |/ |
|
* | | diff: deprecate -q option to diff-filesjc/diff-filter-negation | Junio C Hamano | 2013-07-19 | 1 | -0/+2 |
* | | diff: preparse --diff-filter string argument | Junio C Hamano | 2013-07-17 | 1 | -1/+4 |
|/ |
|
* | 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 |