summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2012-09-11Sync with 1.7.11.6Junio C Hamano
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano
2012-09-11Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Junio C Hamano
2012-08-05merge-recursive: separate message for common ancestorsRalf Thielow
2012-08-03merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast
2012-08-03diff_setup_done(): return voidThomas Rast
2012-07-27i18n: merge-recursive: mark strings for translationJiang Xin
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano
2012-04-16Merge branch 'jc/diff-algo-cleanup'Junio C Hamano
2012-03-23merge-recursive: don't detect renames of empty filesJeff King
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINJeff King
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano
2012-02-08cache-tree: update API to take abitrary flagsNguyễn Thái Ngọc Duy
2011-12-20Merge branch 'tr/cache-tree'Junio C Hamano
2011-12-06Refactor cache_tree_update idiom from commitThomas Rast
2011-11-08merge: make usage of commit->util more extensibleJunio C Hamano
2011-10-13submodule: Search for merges only at end of recursive mergeBrad King
2011-10-05Merge branch 'cn/eradicate-working-copy'Junio C Hamano
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano
2011-09-21Remove 'working copy' from the documentation and C codeCarlos Martín Nieto
2011-09-02Merge branch 'en/merge-recursive-2'Junio C Hamano
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano
2011-08-16merge-recursive: take advantage of hardcoded empty treeJonathan Nieder
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren
2011-08-14merge-recursive: Avoid unnecessary file rewritesElijah Newren
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren
2011-08-14merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren
2011-08-14merge-recursive: Make modify/delete handling code reusableElijah Newren
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren
2011-08-14merge-recursive: Create function for merging with branchname:file markersElijah Newren
2011-08-14merge-recursive: Record more data needed for merging with dual renamesElijah Newren
2011-08-14merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren
2011-08-14merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren
2011-08-14merge-recursive: Introduce a merge_file convenience functionElijah Newren
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itElijah Newren
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesElijah Newren
2011-08-14merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren
2011-08-14merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionElijah Newren
2011-08-14merge-recursive: Add comments about handling rename/add-source casesElijah Newren
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren
2011-08-14merge-recursive: Split update_stages_and_entry; only update stages at endElijah Newren
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren
2011-08-14merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren