summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-1/+1
|\
| * remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-151-1/+1
* | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-3/+4
|/
* diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-0/+9
* Which merge_file() function do you mean?Junio C Hamano2012-12-091-3/+3
* Merge branch 'rj/path-cleanup'Junio C Hamano2012-09-141-6/+7
|\
| * Call mkpathdup() rather than xstrdup(mkpath(...))Ramsay Jones2012-09-041-6/+7
* | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-2/+1
|\ \
| * | diff_setup_done(): return voidThomas Rast2012-08-031-2/+1
* | | Merge branch 'tr/merge-recursive-flush'Junio C Hamano2012-08-221-18/+1
|\ \ \ | |_|/ |/| |
| * | merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast2012-08-031-18/+1
| |/
* | merge-recursive: separate message for common ancestorsRalf Thielow2012-08-051-1/+4
* | i18n: merge-recursive: mark strings for translationJiang Xin2012-07-261-69/+79
* | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-161-1/+2
|\ \
| * | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-231-0/+1
| * | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-231-1/+1
* | | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-151-2/+2
|\ \ \ | |/ / |/| |
| * | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-191-2/+2
* | | cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactorNguyễn Thái Ngọc Duy2012-02-071-1/+1
| |/ |/|
* | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-191-1/+1
|\ \
| * | Refactor cache_tree_update idiom from commitThomas Rast2011-12-061-1/+1
| |/
* | merge: make usage of commit->util more extensibleJunio C Hamano2011-11-081-7/+6
|/
* submodule: Search for merges only at end of recursive mergeBrad King2011-10-131-2/+4
* Merge branch 'cn/eradicate-working-copy'Junio C Hamano2011-10-051-1/+1
|\
| * Remove 'working copy' from the documentation and C codeCarlos Martín Nieto2011-09-211-1/+1
* | merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano2011-09-231-1/+1
|/
* Merge branch 'en/merge-recursive-2'Junio C Hamano2011-09-021-384/+695
|\
| * merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren2011-08-141-4/+12
| * merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-141-2/+21
| * merge-recursive: Avoid unnecessary file rewritesElijah Newren2011-08-141-6/+24
| * merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-141-14/+20
| * merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-141-25/+48
| * merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-141-2/+19
| * merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren2011-08-141-16/+30
| * merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-141-34/+48
| * merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-141-9/+21
| * merge-recursive: Create function for merging with branchname:file markersElijah Newren2011-08-141-9/+33
| * merge-recursive: Record more data needed for merging with dual renamesElijah Newren2011-08-141-3/+39
| * merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren2011-08-141-42/+62
| * merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren2011-08-141-33/+27
| * merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-141-17/+13
| * merge-recursive: Introduce a merge_file convenience functionElijah Newren2011-08-141-35/+37
| * merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-141-14/+24
| * merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-08-141-3/+16
| * merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-141-3/+25
| * merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren2011-08-141-68/+66
| * merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren2011-08-141-131/+57
| * merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-141-5/+22
| * merge-recursive: Add comments about handling rename/add-source casesElijah Newren2011-08-141-0/+11
| * merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-141-22/+48
View Lorry Controller Status