summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2012-09-11Sync with 1.7.11.6Libravatar Junio C Hamano1-20/+2
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Libravatar Junio C Hamano1-2/+1
2012-09-11Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Libravatar 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
2011-08-14merge-recursive: Small cleanups for conflict_rename_rename_1to2Libravatar Elijah Newren1-33/+27
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseLibravatar Elijah Newren1-17/+13
2011-08-14merge-recursive: Introduce a merge_file convenience functionLibravatar Elijah Newren1-35/+37
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseLibravatar Elijah Newren1-14/+24
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren1-3/+16
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren1-3/+25
2011-08-14merge-recursive: Cleanup and consolidation of rename_conflict_infoLibravatar Elijah Newren1-68/+66
2011-08-14merge-recursive: Consolidate process_entry() and process_df_entry()Libravatar Elijah Newren1-131/+57
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionLibravatar Elijah Newren1-5/+22
2011-08-14merge-recursive: Add comments about handling rename/add-source casesLibravatar Elijah Newren1-0/+11
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadLibravatar Elijah Newren1-22/+48
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsLibravatar Elijah Newren1-1/+2
2011-08-14merge-recursive: Split update_stages_and_entry; only update stages at endLibravatar Elijah Newren1-18/+17
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesLibravatar Elijah Newren1-4/+22
2011-08-14merge-recursive: Split was_tracked() out of would_lose_untracked()Libravatar Elijah Newren1-3/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 03:16:25 +0000