aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-16
|\
| * commit: record buffer length in cacheJeff King2014-06-13
| * use get_commit_buffer everywhereJeff King2014-06-13
| * do not create "struct commit" with xcallocJeff King2014-06-12
| * Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano2014-02-27
| |\
* | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-07
* | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-18
|\ \ \ | |/ / |/| / | |/
| * merge-recursive.c: tolerate missing files while refreshing indexBrad King2014-02-24
| * read-cache.c: extend make_cache_entry refresh flag with optionsBrad King2014-02-24
| * Merge branch 'jk/diff-algo' into maintJunio C Hamano2013-10-28
| |\
* | \ Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-27
|\ \ \
| * | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-06
* | | | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
|/ / /
* | | Merge branch 'jk/diff-algo'Jonathan Nieder2013-10-14
|\ \ \ | | |/ | |/|
| * | merge-recursive: fix parsing of "diff-algorithm" optionJohn Keeping2013-09-26
* | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-09
|\ \ \ | |_|/ |/| |
| * | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-15
| |/
* | Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
|/
* diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-16
* Which merge_file() function do you mean?Junio C Hamano2012-12-09
* Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-14
|\
| * Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-04
* | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-22
|\ \
| * | diff_setup_done(): return voidThomas Rast2012-08-03
* | | Merge branch 'tr/merge-recursive-flush'Junio C Hamano2012-08-22
|\ \ \ | |_|/ |/| |
| * | merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast2012-08-03
| |/
* | merge-recursive: separate message for common ancestorsRalf Thielow2012-08-05
* | i18n: merge-recursive: mark strings for translationJiang Xin2012-07-26
* | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-16
|\ \
| * | merge-recursive: don't detect renames of empty filesJeff King2012-03-23
| * | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-23
* | | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-15
|\ \ \ | |/ / |/| |
| * | xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano2012-02-19
* | | cache-tree: update API to take abitrary flagsNguyễn Thái Ngọc Duy2012-02-07
| |/ |/|
* | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-19
|\ \
| * | Refactor cache_tree_update idiom from commitThomas Rast2011-12-06
| |/
* | merge: make usage of commit->util more extensibleJunio C Hamano2011-11-08
|/
* submodule: Search for merges only at end of recursive mergeBrad King2011-10-13
* Merge branch 'cn/eradicate-working-copy'Junio C Hamano2011-10-05
|\
| * Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-21
* | merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano2011-09-23
|/
* Merge branch 'en/merge-recursive-2'Junio C Hamano2011-09-02
|\
| * merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren2011-08-14
| * merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-14
| * merge-recursive: Avoid unnecessary file rewritesElijah Newren2011-08-14
| * merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-14
| * merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-14
| * merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-14
| * merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren2011-08-14
| * merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-14
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 02:27:32 +0000