| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/pretty-empty-format' | Junio C Hamano | 2014-09-02 | 1 | -1/+2 |
|\ |
|
| * | pretty: make empty userformats truly emptyjk/pretty-empty-format | Jeff King | 2014-07-30 | 1 | -1/+2 |
* | | Merge branch 'jk/diff-tree-t-fix' | Junio C Hamano | 2014-08-26 | 1 | -1/+11 |
|\ \
| |/
|/| |
|
| * | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fix | Jeff King | 2014-08-20 | 1 | -1/+11 |
* | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' | Junio C Hamano | 2014-06-06 | 1 | -1/+2 |
|\ \ |
|
| * | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-merges | Max Kirillov | 2014-05-15 | 1 | -1/+2 |
* | | | combine-diff: speed it up, by using multiparent diff tree-walker directly | Kirill Smelkov | 2014-04-07 | 1 | -5/+83 |
* | | | combine-diff: move changed-paths scanning logic into its own function | Kirill Smelkov | 2014-02-24 | 1 | -27/+53 |
* | | | combine-diff: move show_log_first logic/action out of paths scanning | Kirill Smelkov | 2014-02-24 | 1 | -10/+14 |
| |/
|/| |
|
* | | combine-diff: simplify intersect_paths() further | Junio C Hamano | 2014-02-24 | 1 | -22/+12 |
* | | combine-diff: combine_diff_path.len is not needed anymore | Kirill Smelkov | 2014-02-24 | 1 | -21/+9 |
* | | combine-diff: optimize combine_diff_path sets intersection | Kirill Smelkov | 2014-02-24 | 1 | -21/+73 |
|/ |
|
* | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-09-09 | 1 | -2/+2 |
|\ |
|
| * | remove diff_tree_{setup,release}_paths | Nguyễn Thái Ngọc Duy | 2013-07-15 | 1 | -2/+2 |
* | | Merge branch 'tr/log-full-diff-keep-true-parents' | Junio C Hamano | 2013-09-09 | 1 | -1/+2 |
|\ \ |
|
| * | | log: use true parents for diff even when rewriting | Thomas Rast | 2013-08-01 | 1 | -1/+2 |
| |/ |
|
* | | many small typofixesob/typofixes | Ondřej Bílka | 2013-07-29 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'cb/log-follow-with-combined' | Junio C Hamano | 2013-06-11 | 1 | -0/+3 |
|\ |
|
| * | fix segfault with git log -c --follow | Clemens Buchacher | 2013-05-28 | 1 | -0/+3 |
* | | Merge branch 'mk/combine-diff-context-horizon-fix' | Junio C Hamano | 2013-06-02 | 1 | -2/+5 |
|\ \ |
|
| * | | combine-diff.c: Fix output when changes are exactly 3 lines apart | Matthijs Kooijman | 2013-05-15 | 1 | -2/+5 |
* | | | combine-diff: coalesce lost lines optimally | Antoine Pelisse | 2013-03-25 | 1 | -64/+191 |
* | | | Allow combined diff to ignore white-spaces | Antoine Pelisse | 2013-03-14 | 1 | -7/+50 |
* | | | Merge branch 'jk/diff-graph-cleanup' | Junio C Hamano | 2013-02-14 | 1 | -17/+32 |
|\ \ \
| |_|/
|/| | |
|
| * | | combine-diff.c: teach combined diffs about line prefix | John Keeping | 2013-02-12 | 1 | -17/+30 |
| |/ |
|
| * | Merge branch 'jk/maint-null-in-trees' | Junio C Hamano | 2012-08-27 | 1 | -2/+2 |
| |\ |
|
* | | | combine-diff: lift 32-way limit of combined diff | Junio C Hamano | 2013-02-03 | 1 | -14/+7 |
* | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 1 | -2/+2 |
* | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' | Junio C Hamano | 2012-04-16 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginning | René Scharfe | 2012-03-25 | 1 | -1/+1 |
* | | pass struct commit to diff_tree_combined_merge() | René Scharfe | 2011-12-17 | 1 | -4/+3 |
* | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 | 1 | -21/+13 |
* | | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | 1 | -4/+3 |
|\ \ |
|
| * | | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 | 1 | -4/+3 |
* | | | Merge branch 'jc/combine-diff-callback' | Junio C Hamano | 2011-08-28 | 1 | -0/+69 |
|\ \ \ |
|
| * | | | combine-diff: support format_callback | Junio C Hamano | 2011-08-20 | 1 | -0/+69 |
* | | | | Merge branch 'jc/maint-combined-diff-work-tree' | Junio C Hamano | 2011-08-17 | 1 | -4/+10 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" | Junio C Hamano | 2011-08-04 | 1 | -4/+10 |
| * | | | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
| |\ \ \ |
|
* | | | | | combine-diff: respect textconv attributes | Jeff King | 2011-05-24 | 1 | -9/+32 |
* | | | | | combine-diff: handle binary files as binary | Jeff King | 2011-05-23 | 1 | -2/+35 |
* | | | | | combine-diff: calculate mode_differs earlier | Jeff King | 2011-05-23 | 1 | -2/+7 |
* | | | | | combine-diff: split header printing into its own function | Jeff King | 2011-05-23 | 1 | -61/+74 |
| |_|/ /
|/| | | |
|
* | | | | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | git diff too slow for a file | René Scharfe | 2010-05-02 | 1 | -1/+1 |
* | | | remove ecb parameter from xdi_diff_outf() | René Scharfe | 2010-05-04 | 1 | -2/+1 |
|/ / |
|
* | | combined diff: correctly handle truncated file | Thomas Rast | 2010-04-17 | 1 | -6/+8 |
* | | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 | 1 | -1/+4 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-07-22 | 1 | -15/+14 |
|\ \ |
|