summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2014-02-27Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano1-1/+3
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexBrad King1-1/+2
2014-02-24read-cache.c: extend make_cache_entry refresh flag with optionsBrad King1-1/+2
2014-01-27Merge branch 'mh/safe-create-leading-directories'Junio C Hamano1-1/+1
2014-01-06safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-3/+3
2013-10-28Merge branch 'jk/diff-algo' into maintJunio C Hamano1-2/+2
2013-10-14Merge branch 'jk/diff-algo'Jonathan Nieder1-2/+2
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionJohn Keeping1-2/+2
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-1/+1
2013-07-15remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy1-1/+1
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-3/+4
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik1-0/+9
2012-12-09Which merge_file() function do you mean?Junio C Hamano1-3/+3
2012-09-14Merge branch 'rj/path-cleanup'Junio C Hamano1-6/+7
2012-09-04Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones1-6/+7
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-2/+1
2012-08-22Merge branch 'tr/merge-recursive-flush'Junio C Hamano1-18/+1
2012-08-05merge-recursive: separate message for common ancestorsRalf Thielow1-1/+4
2012-08-03merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast1-18/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-2/+1
2012-07-26i18n: merge-recursive: mark strings for translationJiang Xin1-69/+79
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano1-1/+2
2012-04-15Merge branch 'jc/diff-algo-cleanup'Junio C Hamano1-2/+2
2012-03-23merge-recursive: don't detect renames of empty filesJeff King1-0/+1
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINJeff King1-1/+1
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano1-2/+2
2012-02-07cache-tree: update API to take abitrary flagsNguyễn Thái Ngọc Duy1-1/+1
2011-12-19Merge branch 'tr/cache-tree'Junio C Hamano1-1/+1
2011-12-06Refactor cache_tree_update idiom from commitThomas Rast1-1/+1
2011-11-08merge: make usage of commit->util more extensibleJunio C Hamano1-7/+6
2011-10-13submodule: Search for merges only at end of recursive mergeBrad King1-2/+4
2011-10-05Merge branch 'cn/eradicate-working-copy'Junio C Hamano1-1/+1
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano1-1/+1
2011-09-21Remove 'working copy' from the documentation and C codeCarlos Martín Nieto1-1/+1
2011-09-02Merge branch 'en/merge-recursive-2'Junio C Hamano1-384/+695
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano1-5/+3
2011-08-16merge-recursive: take advantage of hardcoded empty treeJonathan Nieder1-5/+3
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren1-4/+12
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren1-2/+21
2011-08-14merge-recursive: Avoid unnecessary file rewritesElijah Newren1-6/+24
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren1-14/+20
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren1-25/+48
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren1-2/+19
2011-08-14merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren1-16/+30
2011-08-14merge-recursive: Make modify/delete handling code reusableElijah Newren1-34/+48
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren1-9/+21
2011-08-14merge-recursive: Create function for merging with branchname:file markersElijah Newren1-9/+33
2011-08-14merge-recursive: Record more data needed for merging with dual renamesElijah Newren1-3/+39
2011-08-14merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren1-42/+62
generated by cgit (git 2.54.0.dirty) at 2026-09-16 00:32:59 +0000