Age | Commit message (Expand) | Author | Files | Lines |
2012-04-15 | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 1 | -2/+2 |
2012-03-23 | merge-recursive: don't detect renames of empty files | Jeff King | 1 | -0/+1 |
2012-03-23 | drop casts from users EMPTY_TREE_SHA1_BIN | Jeff King | 1 | -1/+1 |
2012-02-19 | xdiff: PATIENCE/HISTOGRAM are not independent option bits | Junio C Hamano | 1 | -2/+2 |
2012-02-07 | cache-tree: update API to take abitrary flags | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2011-12-19 | Merge branch 'tr/cache-tree' | Junio C Hamano | 1 | -1/+1 |
2011-12-06 | Refactor cache_tree_update idiom from commit | Thomas Rast | 1 | -1/+1 |
2011-11-08 | merge: make usage of commit->util more extensible | Junio C Hamano | 1 | -7/+6 |
2011-10-13 | submodule: Search for merges only at end of recursive merge | Brad King | 1 | -2/+4 |
2011-10-05 | Merge branch 'cn/eradicate-working-copy' | Junio C Hamano | 1 | -1/+1 |
2011-09-23 | merge-recursive: Do not look at working tree during a virtual ancestor merge | Junio C Hamano | 1 | -1/+1 |
2011-09-21 | Remove 'working copy' from the documentation and C code | Carlos Martín Nieto | 1 | -1/+1 |
2011-09-02 | Merge branch 'en/merge-recursive-2' | Junio C Hamano | 1 | -384/+695 |
2011-08-25 | Merge branch 'jn/plug-empty-tree-leak' | Junio C Hamano | 1 | -5/+3 |
2011-08-16 | merge-recursive: take advantage of hardcoded empty tree | Jonathan Nieder | 1 | -5/+3 |
2011-08-14 | merge-recursive: Don't re-sort a list whose order we depend upon | Elijah Newren | 1 | -4/+12 |
2011-08-14 | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest | Elijah Newren | 1 | -2/+21 |
2011-08-14 | merge-recursive: Avoid unnecessary file rewrites | Elijah Newren | 1 | -6/+24 |
2011-08-14 | merge-recursive: Fix spurious 'refusing to lose untracked file...' messages | Elijah Newren | 1 | -14/+20 |
2011-08-14 | merge-recursive: Fix working copy handling for rename/rename/add/add | Elijah Newren | 1 | -25/+48 |
2011-08-14 | merge-recursive: add handling for rename/rename/add-dest/add-dest | Elijah Newren | 1 | -2/+19 |
2011-08-14 | merge-recursive: Have conflict_rename_delete reuse modify/delete code | Elijah Newren | 1 | -16/+30 |
2011-08-14 | merge-recursive: Make modify/delete handling code reusable | Elijah Newren | 1 | -34/+48 |
2011-08-14 | merge-recursive: Consider modifications in rename/rename(2to1) conflicts | Elijah Newren | 1 | -9/+21 |
2011-08-14 | merge-recursive: Create function for merging with branchname:file markers | Elijah Newren | 1 | -9/+33 |
2011-08-14 | merge-recursive: Record more data needed for merging with dual renames | Elijah Newren | 1 | -3/+39 |
2011-08-14 | merge-recursive: Defer rename/rename(2to1) handling until process_entry | Elijah Newren | 1 | -42/+62 |
2011-08-14 | merge-recursive: Small cleanups for conflict_rename_rename_1to2 | Elijah Newren | 1 | -33/+27 |
2011-08-14 | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base | Elijah Newren | 1 | -17/+13 |
2011-08-14 | merge-recursive: Introduce a merge_file convenience function | Elijah Newren | 1 | -35/+37 |
2011-08-14 | merge-recursive: Fix modify/delete resolution in the recursive case | Elijah Newren | 1 | -14/+24 |
2011-08-14 | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 1 | -3/+16 |
2011-08-14 | merge-recursive: Provide more info in conflict markers with file renames | Elijah Newren | 1 | -3/+25 |
2011-08-14 | merge-recursive: Cleanup and consolidation of rename_conflict_info | Elijah Newren | 1 | -68/+66 |
2011-08-14 | merge-recursive: Consolidate process_entry() and process_df_entry() | Elijah Newren | 1 | -131/+57 |
2011-08-14 | merge-recursive: Improve handling of rename target vs. directory addition | Elijah Newren | 1 | -5/+22 |
2011-08-14 | merge-recursive: Add comments about handling rename/add-source cases | Elijah Newren | 1 | -0/+11 |
2011-08-14 | merge-recursive: Make dead code for rename/rename(2to1) conflicts undead | Elijah Newren | 1 | -22/+48 |
2011-08-14 | merge-recursive: Fix deletion of untracked file in rename/delete conflicts | Elijah Newren | 1 | -1/+2 |
2011-08-14 | merge-recursive: Split update_stages_and_entry; only update stages at end | Elijah Newren | 1 | -18/+17 |
2011-08-14 | merge-recursive: Allow make_room_for_path() to remove D/F entries | Elijah Newren | 1 | -4/+22 |
2011-08-14 | merge-recursive: Split was_tracked() out of would_lose_untracked() | Elijah Newren | 1 | -3/+8 |
2011-08-14 | merge-recursive: Save D/F conflict filenames instead of unlinking them | Elijah Newren | 1 | -16/+24 |
2011-08-14 | merge-recursive: Fix code checking for D/F conflicts still being present | Elijah Newren | 1 | -15/+34 |
2011-08-14 | merge-recursive: Fix sorting order and directory change assumptions | Elijah Newren | 1 | -5/+35 |
2011-08-14 | merge-recursive: Fix recursive case with D/F conflict via add/add conflict | Elijah Newren | 1 | -0/+2 |
2011-08-14 | merge-recursive: Avoid working directory changes during recursive case | Elijah Newren | 1 | -0/+7 |
2011-08-14 | merge-recursive: Remember to free generated unique path names | Elijah Newren | 1 | -8/+12 |
2011-08-14 | merge-recursive: Consolidate different update_stages functions | Elijah Newren | 1 | -18/+9 |
2011-08-14 | merge-recursive: Mark some diff_filespec struct arguments const | Elijah Newren | 1 | -9/+10 |