aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAge
* Merge branch 'bc/cocci'Junio C Hamano2016-07-19
|\
| * diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson2016-06-28
| * diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-28
* | pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano2016-06-02
|/
* combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-09
* use st_add and st_mult for allocation size computationJeff King2016-02-22
* convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-22
* use xmallocz to avoid size arithmeticJeff King2016-02-22
* convert trivial cases to ALLOC_ARRAYJeff King2016-02-22
* Remove get_object_hash.brian m. carlson2015-11-20
* Add several uses of get_object_hash.brian m. carlson2015-11-20
* Sync with 2.4.10Junio C Hamano2015-09-28
|\
| * Sync with 2.3.10Junio C Hamano2015-09-28
| |\
| | * react to errors in xdi_diffJeff King2015-09-28
* | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-11
|\ \ \ | |/ /
| * | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King2015-05-27
| |/
* | diff: convert struct combine_diff_path to object_idbrian m. carlson2015-03-13
|/
* Merge branch 'jk/pretty-empty-format'Junio C Hamano2014-09-02
|\
| * pretty: make empty userformats truly emptyJeff King2014-07-30
* | Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-26
|\ \ | |/ |/|
| * intersect_paths: respect mode in git's tree-sortJeff King2014-08-20
* | Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano2014-06-06
|\ \
| * | git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov2014-05-15
* | | combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov2014-04-07
* | | combine-diff: move changed-paths scanning logic into its own functionKirill Smelkov2014-02-24
* | | combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov2014-02-24
| |/ |/|
* | combine-diff: simplify intersect_paths() furtherJunio C Hamano2014-02-24
* | combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-24
* | combine-diff: optimize combine_diff_path sets intersectionKirill Smelkov2014-02-24
|/
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-09
|\
| * remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-15
* | Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano2013-09-09
|\ \
| * | log: use true parents for diff even when rewritingThomas Rast2013-08-01
| |/
* | many small typofixesOndřej Bílka2013-07-29
|/
* Merge branch 'cb/log-follow-with-combined'Junio C Hamano2013-06-11
|\
| * fix segfault with git log -c --followClemens Buchacher2013-05-28
* | Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano2013-06-02
|\ \
| * | combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2013-05-15
* | | combine-diff: coalesce lost lines optimallyAntoine Pelisse2013-03-25
* | | Allow combined diff to ignore white-spacesAntoine Pelisse2013-03-14
* | | Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-14
|\ \ \ | |_|/ |/| |
| * | combine-diff.c: teach combined diffs about line prefixJohn Keeping2013-02-12
| |/
| * Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-27
| |\
* | | combine-diff: lift 32-way limit of combined diffJunio C Hamano2013-02-03
* | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-10
|\ \ \ | |/ / |/| / | |/
| * diff: do not use null sha1 as a sentinel valueJeff King2012-07-29
* | Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano2012-04-16
|\ \ | |/ |/|
| * combine-diff: fix loop index underflowRené Scharfe2012-03-25
* | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-17
* | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-17
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 11:19:36 +0000