summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano2019-05-091-1/+6
|\
| * commit.cocci: refactor code, avoid double rewriteNguyễn Thái Ngọc Duy2019-04-161-1/+6
* | Merge branch 'en/merge-directory-renames'Junio C Hamano2019-05-091-938/+915
|\ \
| * | merge-recursive: switch directory rename detection defaultElijah Newren2019-04-081-23/+123
| * | merge-recursive: give callers of handle_content_merge() access to contentsElijah Newren2019-04-081-17/+20
| * | merge-recursive: track information associated with directory renamesElijah Newren2019-04-081-14/+23
| * | merge-recursive: switch from (oid,mode) pairs to a diff_filespecElijah Newren2019-04-081-268/+215
| * | merge-recursive: cleanup handle_rename_* function signaturesElijah Newren2019-04-081-16/+15
| * | merge-recursive: track branch where rename occurred in rename structElijah Newren2019-04-081-71/+42
| * | merge-recursive: remove ren[12]_other fields from rename_conflict_infoElijah Newren2019-04-081-50/+21
| * | merge-recursive: shrink rename_conflict_infoElijah Newren2019-04-081-70/+50
| * | merge-recursive: move some struct declarations togetherElijah Newren2019-04-081-39/+39
| * | merge-recursive: use 'ci' for rename_conflict_info variable nameElijah Newren2019-04-081-23/+18
| * | merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Elijah Newren2019-04-081-8/+10
| * | merge-recursive: rename diff_filespec 'one' to 'o'Elijah Newren2019-04-081-23/+23
| * | merge-recursive: rename merge_options argument from 'o' to 'opt'Elijah Newren2019-04-081-492/+492
| * | Use 'unsigned short' for mode, like diff_filespec doesElijah Newren2019-04-081-3/+3
| |/
* | submodule: avoid hard-coded constantsbrian m. carlson2019-04-011-1/+1
|/
* Merge branch 'nd/completion-more-parameters'Junio C Hamano2019-03-071-0/+4
|\
| * completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-201-0/+4
* | merge-recursive: drop several unused parametersJeff King2019-02-141-12/+7
|/
* Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-88/+103
|\
| * read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy2019-01-141-1/+1
| * merge-recursive.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy2019-01-141-21/+24
| * merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2019-01-141-68/+80
| * read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy2019-01-141-1/+1
| * repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy2019-01-141-1/+1
* | Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano2019-01-141-1/+2
|\ \ | |/ |/|
| * tree.c: make read_tree*() take 'struct repository *'Nguyễn Thái Ngọc Duy2018-11-191-1/+2
* | Merge branch 'en/merge-path-collision'Junio C Hamano2019-01-041-213/+316
|\ \ | |/ |/|
| * merge-recursive: combine error handlingDerrick Stolee2018-11-081-26/+27
| * merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren2018-11-081-77/+77
| * merge-recursive: use handle_file_collision for add/add conflictsElijah Newren2018-11-081-8/+21
| * merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren2018-11-081-90/+14
| * merge-recursive: fix rename/add conflict handlingElijah Newren2018-11-081-51/+86
| * merge-recursive: new function for better colliding conflict resolutionsElijah Newren2018-11-081-0/+121
| * merge-recursive: increase marker length with depth of recursionElijah Newren2018-11-081-8/+17
* | Merge branch 'en/merge-cleanup-more'Junio C Hamano2018-11-031-3/+33
|\ \ | |/
| * merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren2018-10-181-1/+31
| * merge-recursive: improve auto-merging messages with path collisionsElijah Newren2018-10-181-2/+2
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-3/+4
|\ \
| * | revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * | ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| * | diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
* | | Merge branch 'en/merge-cleanup'Junio C Hamano2018-10-161-93/+51
|\ \ \ | | |/ | |/|
| * | merge-recursive: rename merge_file_1() and merge_content()Elijah Newren2018-09-201-32/+34
| * | merge-recursive: remove final remaining caller of merge_file_one()Elijah Newren2018-09-201-27/+17
| * | merge-recursive: avoid wrapper function when unnecessary and wastefulElijah Newren2018-09-201-4/+1
| * | merge-recursive: set paths correctly when three-way merging contentElijah Newren2018-09-201-40/+9
* | | Merge branch 'en/double-semicolon-fix'Junio C Hamano2018-09-241-1/+1
|\ \ \ | |/ / |/| |
View Lorry Controller Status