aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* 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
| * merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-14
| * merge-recursive: Create function for merging with branchname:file markersElijah Newren2011-08-14
| * merge-recursive: Record more data needed for merging with dual renamesElijah Newren2011-08-14
| * merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren2011-08-14
| * merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren2011-08-14
| * merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-14
| * merge-recursive: Introduce a merge_file convenience functionElijah Newren2011-08-14
| * merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-14
| * merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-08-14
| * merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-14
| * merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren2011-08-14
| * merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren2011-08-14
| * merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-14
| * merge-recursive: Add comments about handling rename/add-source casesElijah Newren2011-08-14
| * merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-14
| * merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren2011-08-14
| * merge-recursive: Split update_stages_and_entry; only update stages at endElijah Newren2011-08-14
| * merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren2011-08-14
| * merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren2011-08-14