| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'rj/path-cleanup' | Junio C Hamano | 2012-09-14 | 1 | -6/+7 |
|\ |
|
| * | Call mkpathdup() rather than xstrdup(mkpath(...)) | Ramsay Jones | 2012-09-04 | 1 | -6/+7 |
* | | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 1 | -2/+1 |
|\ \ |
|
| * | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -2/+1 |
* | | | Merge branch 'tr/merge-recursive-flush' | Junio C Hamano | 2012-08-22 | 1 | -18/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | merge-recursive: eliminate flush_buffer() in favor of write_in_full() | Thomas Rast | 2012-08-03 | 1 | -18/+1 |
| |/ |
|
* | | merge-recursive: separate message for common ancestors | Ralf Thielow | 2012-08-05 | 1 | -1/+4 |
* | | i18n: merge-recursive: mark strings for translation | Jiang Xin | 2012-07-26 | 1 | -69/+79 |
* | | Merge branch 'jk/diff-no-rename-empty' | Junio C Hamano | 2012-04-16 | 1 | -1/+2 |
|\ \ |
|
| * | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-empty | Jeff King | 2012-03-23 | 1 | -0/+1 |
| * | | drop casts from users EMPTY_TREE_SHA1_BIN | Jeff King | 2012-03-23 | 1 | -1/+1 |
* | | | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 2012-04-15 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanup | Junio C Hamano | 2012-02-19 | 1 | -2/+2 |
* | | | cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactor | Nguyễn Thái Ngọc Duy | 2012-02-07 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge branch 'tr/cache-tree' | Junio C Hamano | 2011-12-19 | 1 | -1/+1 |
|\ \ |
|
| * | | Refactor cache_tree_update idiom from commit | Thomas Rast | 2011-12-06 | 1 | -1/+1 |
| |/ |
|
* | | merge: make usage of commit->util more extensible | Junio C Hamano | 2011-11-08 | 1 | -7/+6 |
|/ |
|
* | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 | 1 | -2/+4 |
* | Merge branch 'cn/eradicate-working-copy' | Junio C Hamano | 2011-10-05 | 1 | -1/+1 |
|\ |
|
| * | Remove 'working copy' from the documentation and C code | Carlos Martín Nieto | 2011-09-21 | 1 | -1/+1 |
* | | merge-recursive: Do not look at working tree during a virtual ancestor merge | Junio C Hamano | 2011-09-23 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'en/merge-recursive-2' | Junio C Hamano | 2011-09-02 | 1 | -384/+695 |
|\ |
|
| * | merge-recursive: Don't re-sort a list whose order we depend upon | Elijah Newren | 2011-08-14 | 1 | -4/+12 |
| * | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest | Elijah Newren | 2011-08-14 | 1 | -2/+21 |
| * | merge-recursive: Avoid unnecessary file rewrites | Elijah Newren | 2011-08-14 | 1 | -6/+24 |
| * | merge-recursive: Fix spurious 'refusing to lose untracked file...' messages | Elijah Newren | 2011-08-14 | 1 | -14/+20 |
| * | merge-recursive: Fix working copy handling for rename/rename/add/add | Elijah Newren | 2011-08-14 | 1 | -25/+48 |
| * | merge-recursive: add handling for rename/rename/add-dest/add-dest | Elijah Newren | 2011-08-14 | 1 | -2/+19 |
| * | merge-recursive: Have conflict_rename_delete reuse modify/delete code | Elijah Newren | 2011-08-14 | 1 | -16/+30 |
| * | merge-recursive: Make modify/delete handling code reusable | Elijah Newren | 2011-08-14 | 1 | -34/+48 |
| * | merge-recursive: Consider modifications in rename/rename(2to1) conflicts | Elijah Newren | 2011-08-14 | 1 | -9/+21 |
| * | merge-recursive: Create function for merging with branchname:file markers | Elijah Newren | 2011-08-14 | 1 | -9/+33 |
| * | merge-recursive: Record more data needed for merging with dual renames | Elijah Newren | 2011-08-14 | 1 | -3/+39 |
| * | merge-recursive: Defer rename/rename(2to1) handling until process_entry | Elijah Newren | 2011-08-14 | 1 | -42/+62 |
| * | merge-recursive: Small cleanups for conflict_rename_rename_1to2 | Elijah Newren | 2011-08-14 | 1 | -33/+27 |
| * | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base | Elijah Newren | 2011-08-14 | 1 | -17/+13 |
| * | merge-recursive: Introduce a merge_file convenience function | Elijah Newren | 2011-08-14 | 1 | -35/+37 |
| * | merge-recursive: Fix modify/delete resolution in the recursive case | Elijah Newren | 2011-08-14 | 1 | -14/+24 |
| * | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 2011-08-14 | 1 | -3/+16 |
| * | merge-recursive: Provide more info in conflict markers with file renames | Elijah Newren | 2011-08-14 | 1 | -3/+25 |
| * | merge-recursive: Cleanup and consolidation of rename_conflict_info | Elijah Newren | 2011-08-14 | 1 | -68/+66 |
| * | merge-recursive: Consolidate process_entry() and process_df_entry() | Elijah Newren | 2011-08-14 | 1 | -131/+57 |
| * | merge-recursive: Improve handling of rename target vs. directory addition | Elijah Newren | 2011-08-14 | 1 | -5/+22 |
| * | merge-recursive: Add comments about handling rename/add-source cases | Elijah Newren | 2011-08-14 | 1 | -0/+11 |
| * | merge-recursive: Make dead code for rename/rename(2to1) conflicts undead | Elijah Newren | 2011-08-14 | 1 | -22/+48 |
| * | merge-recursive: Fix deletion of untracked file in rename/delete conflicts | Elijah Newren | 2011-08-14 | 1 | -1/+2 |
| * | merge-recursive: Split update_stages_and_entry; only update stages at end | Elijah Newren | 2011-08-14 | 1 | -18/+17 |
| * | merge-recursive: Allow make_room_for_path() to remove D/F entries | Elijah Newren | 2011-08-14 | 1 | -4/+22 |
| * | merge-recursive: Split was_tracked() out of would_lose_untracked() | Elijah Newren | 2011-08-14 | 1 | -3/+8 |
| * | merge-recursive: Save D/F conflict filenames instead of unlinking them | Elijah Newren | 2011-08-14 | 1 | -16/+24 |