summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ / |/| |
| * | Remove superfluous trailing semicolonsElijah Newren2018-09-051-1/+1
* | | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-2/+2
|\ \ \
| * | | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-2/+2
* | | | Merge branch 'ds/reachable'Junio C Hamano2018-09-171-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1
* | | | Merge branch 'en/directory-renames-nothanks'Junio C Hamano2018-09-041-5/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | merge-recursive: add ability to turn off directory rename detectionElijah Newren2018-08-301-5/+13
| | |/ | |/|
* | | Merge branch 'nd/no-the-index'Junio C Hamano2018-08-201-1/+1
|\ \ \
| * | | convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-1/+1
* | | | Merge branch 'en/merge-recursive-skip-fix'Junio C Hamano2018-08-151-0/+16
|\ \ \ \ | |/ / / |/| | |
| * | | merge-recursive: preserve skip_worktree bit when necessaryElijah Newren2018-07-271-0/+16
| |/ /
* | | Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-021-7/+7
|\ \ \
| * | | merge-recursive: enforce rule that index matches head before mergingElijah Newren2018-07-111-7/+7
| * | | merge-recursive: fix assumption that head tree being merged is HEADElijah Newren2018-07-111-1/+1
| * | | merge-recursive: make sure when we say we abort that we actually abortElijah Newren2018-07-111-2/+2
| * | | index_has_changes(): avoid assuming operating on the_indexElijah Newren2018-07-031-1/+1
* | | | Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-021-2/+2
|\ \ \ \
| * | | | block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-1/+1
| * | | | read-cache: teach make_cache_entry to take object_idJameson Miller2018-07-031-1/+1
| * | | | read-cache: teach refresh_cache_entry to take istateJameson Miller2018-07-031-1/+1
| | |/ / | |/| |
* | | | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-7/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | tag: add repository argument to deref_tagStefan Beller2018-06-291-1/+2
| * | | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-3/+3
| * | | tree: add repository argument to lookup_treeStefan Beller2018-06-291-3/+3
| * | | object: add repository argument to parse_objectStefan Beller2018-06-291-1/+3
| * | | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-0/+1
| |\ \ \
* | \ \ \ Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2018-07-181-82/+104
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | merge-recursive: add pointer about unduly complex looking codeElijah Newren2018-06-121-0/+15
| * | | | merge-recursive: rename conflict_rename_*() family of functionsElijah Newren2018-06-121-43/+43
| * | | | merge-recursive: clarify the rename_dir/RENAME_DIR meaningElijah Newren2018-06-121-11/+17
| * | | | merge-recursive: align labels with their respective code blocksElijah Newren2018-06-121-3/+3
| * | | | merge-recursive: fix numerous argument alignment issuesElijah Newren2018-06-121-37/+38
| * | | | merge-recursive: fix miscellaneous grammar error in commentElijah Newren2018-06-121-1/+1
* | | | | Merge branch 'sb/object-store-alloc'Junio C Hamano2018-06-251-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | alloc: allow arbitrary repositories for alloc functionsStefan Beller2018-05-161-0/+1
| * | | | alloc: add repository argument to alloc_commit_nodeStefan Beller2018-05-091-1/+1
* | | | | Merge branch 'nd/commit-util-to-slab'Junio C Hamano2018-06-251-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | merge: use commit-slab in merge remote desc instead of commit->utilNguyễn Thái Ngọc Duy2018-05-211-3/+5
| |/ / /
View Lorry Controller Status