summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2014-03-18Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintLibravatar Junio C Hamano1-1/+3
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexLibravatar Brad King1-1/+2
2014-02-24read-cache.c: extend make_cache_entry refresh flag with optionsLibravatar Brad King1-1/+2
2014-01-27Merge branch 'mh/safe-create-leading-directories'Libravatar Junio C Hamano1-1/+1
2014-01-06safe_create_leading_directories(): introduce enum for return valuesLibravatar Michael Haggerty1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-3/+3
2013-10-28Merge branch 'jk/diff-algo' into maintLibravatar Junio C Hamano1-2/+2
2013-10-14Merge branch 'jk/diff-algo'Libravatar Jonathan Nieder1-2/+2
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionLibravatar John Keeping1-2/+2
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-1/+1
2013-07-15remove init_pathspec() in favor of parse_pathspec()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-3/+4
2013-01-16diff: Introduce --diff-algorithm command line optionLibravatar Michal Privoznik1-0/+9
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano1-3/+3
2012-09-14Merge branch 'rj/path-cleanup'Libravatar Junio C Hamano1-6/+7
2012-09-04Call mkpathdup() rather than xstrdup(mkpath(...))Libravatar Ramsay Jones1-6/+7
2012-08-22Merge branch 'tr/void-diff-setup-done'Libravatar Junio C Hamano1-2/+1
2012-08-22Merge branch 'tr/merge-recursive-flush'Libravatar Junio C Hamano1-18/+1
2012-08-05merge-recursive: separate message for common ancestorsLibravatar Ralf Thielow1-1/+4
2012-08-03merge-recursive: eliminate flush_buffer() in favor of write_in_full()Libravatar Thomas Rast1-18/+1
2012-08-03diff_setup_done(): return voidLibravatar Thomas Rast1-2/+1
2012-07-26i18n: merge-recursive: mark strings for translationLibravatar Jiang Xin1-69/+79
2012-04-16Merge branch 'jk/diff-no-rename-empty'Libravatar Junio C Hamano1-1/+2
2012-04-15Merge branch 'jc/diff-algo-cleanup'Libravatar Junio C Hamano1-2/+2
2012-03-23merge-recursive: don't detect renames of empty filesLibravatar Jeff King1-0/+1
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINLibravatar Jeff King1-1/+1
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsLibravatar Junio C Hamano1-2/+2
2012-02-07cache-tree: update API to take abitrary flagsLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-12-19Merge branch 'tr/cache-tree'Libravatar Junio C Hamano1-1/+1
2011-12-06Refactor cache_tree_update idiom from commitLibravatar Thomas Rast1-1/+1
2011-11-08merge: make usage of commit->util more extensibleLibravatar Junio C Hamano1-7/+6
2011-10-13submodule: Search for merges only at end of recursive mergeLibravatar Brad King1-2/+4
2011-10-05Merge branch 'cn/eradicate-working-copy'Libravatar Junio C Hamano1-1/+1
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeLibravatar Junio C Hamano1-1/+1
2011-09-21Remove 'working copy' from the documentation and C codeLibravatar Carlos Martín Nieto1-1/+1
2011-09-02Merge branch 'en/merge-recursive-2'Libravatar Junio C Hamano1-384/+695
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Libravatar Junio C Hamano1-5/+3
2011-08-16merge-recursive: take advantage of hardcoded empty treeLibravatar Jonathan Nieder1-5/+3
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponLibravatar Elijah Newren1-4/+12
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destLibravatar Elijah Newren1-2/+21
2011-08-14merge-recursive: Avoid unnecessary file rewritesLibravatar Elijah Newren1-6/+24
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesLibravatar Elijah Newren1-14/+20
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addLibravatar Elijah Newren1-25/+48
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destLibravatar Elijah Newren1-2/+19
2011-08-14merge-recursive: Have conflict_rename_delete reuse modify/delete codeLibravatar Elijah Newren1-16/+30
2011-08-14merge-recursive: Make modify/delete handling code reusableLibravatar Elijah Newren1-34/+48
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsLibravatar Elijah Newren1-9/+21
2011-08-14merge-recursive: Create function for merging with branchname:file markersLibravatar Elijah Newren1-9/+33
2011-08-14merge-recursive: Record more data needed for merging with dual renamesLibravatar Elijah Newren1-3/+39
2011-08-14merge-recursive: Defer rename/rename(2to1) handling until process_entryLibravatar Elijah Newren1-42/+62