summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
...
| * | merge-recursive: comment and reorder the merge_options fieldsElijah Newren2019-08-191-5/+11
| * | merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren2019-08-191-16/+11
| * | merge-recursive: move some definitions around to clean up the headerElijah Newren2019-08-191-0/+31
| * | merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren2019-08-191-3/+4
| * | merge-recursive: use common name for ancestors/common/base_listElijah Newren2019-08-191-35/+37
| * | merge-recursive: fix some overly long linesElijah Newren2019-08-191-6/+13
| * | cache-tree: share code between functions writing an index as a treeElijah Newren2019-08-191-32/+2
| * | merge-recursive: don't force external callers to do our loggingElijah Newren2019-08-191-4/+3
| * | merge-recursive: remove useless parameter in merge_trees()Elijah Newren2019-08-191-3/+3
| * | merge-recursive: exit early if index != headElijah Newren2019-08-191-29/+72
| * | merge-recursive: remove another implicit dependency on the_repositoryElijah Newren2019-08-191-2/+5
| * | merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren2019-08-191-3/+5
| * | merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee2019-08-191-9/+15
| * | merge-recursive: provide a better label for diff3 common ancestorElijah Newren2019-08-191-1/+15
| * | merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren2019-08-161-10/+9
| * | merge-recursive: be consistent with assertElijah Newren2019-08-161-1/+1
| |/
* | merge-recursive: symlink's descendants not in wayJonathan Tan2019-09-201-1/+2
|/
* Merge branch 'en/disable-dir-rename-in-recursive-merge'Junio C Hamano2019-08-081-1/+2
|\
| * merge-recursive: avoid directory rename detection in recursive caseElijah Newren2019-08-061-1/+2
* | Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy2019-06-271-15/+20
* | match-trees.c: remove the_repo from shift_tree*()Nguyễn Thái Ngọc Duy2019-06-271-2/+2
* | tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy2019-06-271-3/+5
|/
* Merge branch 'en/merge-directory-renames-fix'Junio C Hamano2019-06-061-0/+1
|\
| * merge-recursive: restore accidentally dropped setting of pathElijah Newren2019-06-051-0/+1
* | 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
View Lorry Controller Status