summaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAgeFilesLines
* pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-021-1/+1
* combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-2/+1
* use st_add and st_mult for allocation size computationJeff King2016-02-221-7/+7
* convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-221-3/+1
* use xmallocz to avoid size arithmeticJeff King2016-02-221-3/+1
* convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-2/+2
* Remove get_object_hash.brian m. carlson2015-11-201-2/+2
* Add several uses of get_object_hash.brian m. carlson2015-11-201-2/+2
* Sync with 2.4.10Junio C Hamano2015-09-281-2/+4
|\
| * Sync with 2.3.10Junio C Hamano2015-09-281-2/+4
| |\
| | * react to errors in xdi_diffJeff King2015-09-281-2/+4
* | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-111-3/+3
|\ \ \ | |/ /
| * | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-271-3/+3
| |/
* | diff: convert struct combine_diff_path to object_idbrian m. carlson2015-03-131-28/+28
|/
* Merge branch 'jk/pretty-empty-format'Junio C Hamano2014-09-021-1/+2
|\
| * pretty: make empty userformats truly emptyjk/pretty-empty-formatJeff King2014-07-301-1/+2
* | Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-261-1/+11
|\ \ | |/ |/|
| * intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-201-1/+11
* | Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano2014-06-061-1/+2
|\ \
| * | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-151-1/+2
* | | combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov2014-04-071-5/+83
* | | combine-diff: move changed-paths scanning logic into its own functionKirill Smelkov2014-02-241-27/+53
* | | combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov2014-02-241-10/+14
| |/ |/|
* | combine-diff: simplify intersect_paths() furtherJunio C Hamano2014-02-241-22/+12
* | combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-241-21/+9
* | combine-diff: optimize combine_diff_path sets intersectionKirill Smelkov2014-02-241-21/+73
|/
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-2/+2
|\
| * remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-151-2/+2
* | Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano2013-09-091-1/+2
|\ \
| * | log: use true parents for diff even when rewritingThomas Rast2013-08-011-1/+2
| |/
* | many small typofixesob/typofixesOndřej Bílka2013-07-291-1/+1
|/
* Merge branch 'cb/log-follow-with-combined'Junio C Hamano2013-06-111-0/+3
|\
| * fix segfault with git log -c --followClemens Buchacher2013-05-281-0/+3
* | Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano2013-06-021-2/+5
|\ \
| * | combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2013-05-151-2/+5
* | | combine-diff: coalesce lost lines optimallyAntoine Pelisse2013-03-251-64/+191
* | | Allow combined diff to ignore white-spacesAntoine Pelisse2013-03-141-7/+50
* | | Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-141-17/+32
|\ \ \ | |_|/ |/| |
| * | combine-diff.c: teach combined diffs about line prefixJohn Keeping2013-02-121-17/+30
| |/
| * Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-271-2/+2
| |\
* | | combine-diff: lift 32-way limit of combined diffJunio C Hamano2013-02-031-14/+7
* | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-2/+2
|\ \ \ | |/ / |/| / | |/
| * diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-2/+2
* | Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano2012-04-161-1/+1
|\ \ | |/ |/|
| * combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginningRené Scharfe2012-03-251-1/+1
* | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-171-4/+3
* | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-171-21/+13
* | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-4/+3
|\ \
| * | diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-181-4/+3
* | | Merge branch 'jc/combine-diff-callback'Junio C Hamano2011-08-281-0/+69
|\ \ \
View Lorry Controller Status