| Commit message (Expand) | Author | Age |
* | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 |
|\ |
|
| * | remove diff_tree_{setup,release}_paths | Nguyễn Thái Ngọc Duy | 2013-07-15 |
* | | Merge branch 'tr/log-full-diff-keep-true-parents' | Junio C Hamano | 2013-09-09 |
|\ \ |
|
| * | | log: use true parents for diff even when rewriting | Thomas Rast | 2013-08-01 |
| |/ |
|
* | | many small typofixes | Ondřej Bílka | 2013-07-29 |
|/ |
|
* | Merge branch 'cb/log-follow-with-combined' | Junio C Hamano | 2013-06-11 |
|\ |
|
| * | fix segfault with git log -c --follow | Clemens Buchacher | 2013-05-28 |
* | | Merge branch 'mk/combine-diff-context-horizon-fix' | Junio C Hamano | 2013-06-02 |
|\ \ |
|
| * | | combine-diff.c: Fix output when changes are exactly 3 lines apart | Matthijs Kooijman | 2013-05-15 |
* | | | combine-diff: coalesce lost lines optimally | Antoine Pelisse | 2013-03-25 |
* | | | Allow combined diff to ignore white-spaces | Antoine Pelisse | 2013-03-14 |
* | | | Merge branch 'jk/diff-graph-cleanup' | Junio C Hamano | 2013-02-14 |
|\ \ \
| |_|/
|/| | |
|
| * | | combine-diff.c: teach combined diffs about line prefix | John Keeping | 2013-02-12 |
| |/ |
|
| * | Merge branch 'jk/maint-null-in-trees' | Junio C Hamano | 2012-08-27 |
| |\ |
|
* | | | combine-diff: lift 32-way limit of combined diff | Junio C Hamano | 2013-02-03 |
* | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 |
* | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' | Junio C Hamano | 2012-04-16 |
|\ \
| |/
|/| |
|
| * | combine-diff: fix loop index underflow | René Scharfe | 2012-03-25 |
* | | pass struct commit to diff_tree_combined_merge() | René Scharfe | 2011-12-17 |
* | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 |
* | | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 |
|\ \ |
|
| * | | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 |
* | | | Merge branch 'jc/combine-diff-callback' | Junio C Hamano | 2011-08-28 |
|\ \ \ |
|
| * | | | combine-diff: support format_callback | Junio C Hamano | 2011-08-20 |
* | | | | Merge branch 'jc/maint-combined-diff-work-tree' | Junio C Hamano | 2011-08-17 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" | Junio C Hamano | 2011-08-04 |
| * | | | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 |
| |\ \ \ |
|
* | | | | | combine-diff: respect textconv attributes | Jeff King | 2011-05-24 |
* | | | | | combine-diff: handle binary files as binary | Jeff King | 2011-05-23 |
* | | | | | combine-diff: calculate mode_differs earlier | Jeff King | 2011-05-23 |
* | | | | | combine-diff: split header printing into its own function | Jeff King | 2011-05-23 |
| |_|/ /
|/| | | |
|
* | | | | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | git diff too slow for a file | René Scharfe | 2010-05-02 |
* | | | remove ecb parameter from xdi_diff_outf() | René Scharfe | 2010-05-04 |
|/ / |
|
* | | combined diff: correctly handle truncated file | Thomas Rast | 2010-04-17 |
* | | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-07-22 |
|\ \ |
|
| * | | diff --cc: a lost line at the beginning of the file is shown incorrectly | Junio C Hamano | 2009-07-22 |
| * | | combine-diff.c: fix performance problem when folding common deleted lines | Junio C Hamano | 2009-07-22 |
* | | | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 |
|/ / |
|
* | | Fix a bunch of pointer declarations (codestyle) | Felipe Contreras | 2009-05-01 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-04-29 |
|\ \ |
|
| * \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-29 |
| |\ \ |
|
| | * | | diff -c -p: do not die on submodules | Junio C Hamano | 2009-04-29 |
* | | | | Merge branch 'kb/checkout-optim' | Junio C Hamano | 2009-03-17 |
|\ \ \ \ |
|
| * | | | | show_patch_diff(): remove a call to fstat() | Kjetil Barvik | 2009-02-09 |
| |/ / / |
|
* | | | | Move local variables to narrower scopes | Benjamin Kramer | 2009-03-07 |
|/ / / |
|
* | | | combine-diff.c: use strbuf_readlink() | Junio C Hamano | 2008-12-17 |
* | | | Always initialize xpparam_t to 0 | Brian Downing | 2008-10-25 |