summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2018-08-15Merge branch 'en/merge-recursive-skip-fix'Libravatar Junio C Hamano1-0/+16
2018-08-02Merge branch 'en/dirty-merge-fixes'Libravatar Junio C Hamano1-7/+7
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Libravatar Junio C Hamano1-2/+2
2018-08-02Merge branch 'sb/object-store-lookup'Libravatar Junio C Hamano1-7/+10
2018-07-27merge-recursive: preserve skip_worktree bit when necessaryLibravatar Elijah Newren1-0/+16
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-0/+1
2018-07-18Merge branch 'en/merge-recursive-cleanup'Libravatar Junio C Hamano1-82/+104
2018-07-11merge-recursive: enforce rule that index matches head before mergingLibravatar Elijah Newren1-7/+7
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADLibravatar Elijah Newren1-1/+1
2018-07-11merge-recursive: make sure when we say we abort that we actually abortLibravatar Elijah Newren1-2/+2
2018-07-03index_has_changes(): avoid assuming operating on the_indexLibravatar Elijah Newren1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsLibravatar Jameson Miller1-1/+1
2018-07-03read-cache: teach make_cache_entry to take object_idLibravatar Jameson Miller1-1/+1
2018-07-03read-cache: teach refresh_cache_entry to take istateLibravatar Jameson Miller1-1/+1
2018-06-29tag: add repository argument to deref_tagLibravatar Stefan Beller1-1/+2
2018-06-29commit: add repository argument to lookup_commit_referenceLibravatar Stefan Beller1-3/+3
2018-06-29tree: add repository argument to lookup_treeLibravatar Stefan Beller1-3/+3
2018-06-29object: add repository argument to parse_objectLibravatar Stefan Beller1-1/+3
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupLibravatar Junio C Hamano1-0/+1
2018-06-25Merge branch 'sb/object-store-alloc'Libravatar Junio C Hamano1-1/+2
2018-06-25Merge branch 'nd/commit-util-to-slab'Libravatar Junio C Hamano1-3/+5
2018-06-18Merge branch 'en/rename-directory-detection'Libravatar Junio C Hamano1-5/+5
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferLibravatar René Scharfe1-5/+5
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Libravatar Junio C Hamano1-2/+2
2018-06-12merge-recursive: add pointer about unduly complex looking codeLibravatar Elijah Newren1-0/+15
2018-06-12merge-recursive: rename conflict_rename_*() family of functionsLibravatar Elijah Newren1-43/+43
2018-06-12merge-recursive: clarify the rename_dir/RENAME_DIR meaningLibravatar Elijah Newren1-11/+17
2018-06-12merge-recursive: align labels with their respective code blocksLibravatar Elijah Newren1-3/+3
2018-06-12merge-recursive: fix numerous argument alignment issuesLibravatar Elijah Newren1-37/+38
2018-06-12merge-recursive: fix miscellaneous grammar error in commentLibravatar Elijah Newren1-1/+1
2018-06-11merge-submodule: reduce output verbosityLibravatar Leif Middelschulte1-2/+2
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Libravatar Junio C Hamano1-14/+16
2018-05-30Merge branch 'sb/submodule-merge-in-merge-recursive'Libravatar Junio C Hamano1-3/+182
2018-05-30Merge branch 'js/use-bug-macro'Libravatar Junio C Hamano1-6/+6
2018-05-30Merge branch 'bp/merge-rename-config'Libravatar Junio C Hamano1-6/+25
2018-05-23Merge branch 'en/rename-directory-detection-reboot'Libravatar Junio C Hamano1-170/+1262
2018-05-23Merge branch 'ds/lazy-load-trees'Libravatar Junio C Hamano1-2/+3
2018-05-22unpack_trees_options: free messages when doneLibravatar Martin Ågren1-0/+1
2018-05-21merge: use commit-slab in merge remote desc instead of commit->utilLibravatar Nguyễn Thái Ngọc Duy1-3/+5
2018-05-21merge-recursive: provide pair of `unpack_trees_{start,finish}()`Libravatar Elijah Newren1-14/+15
2018-05-18merge-recursive: give notice when submodule commit gets fast-forwardedLibravatar Leif Middelschulte1-0/+16
2018-05-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
2018-05-16alloc: allow arbitrary repositories for alloc functionsLibravatar Stefan Beller1-0/+1
2018-05-16merge-recursive: i18n submodule merge output and respect verbosityLibravatar Stefan Beller1-18/+15
2018-05-16submodule.c: move submodule merging to merge-recursive.cLibravatar Stefan Beller1-0/+166
2018-05-09alloc: add repository argument to alloc_commit_nodeLibravatar Stefan Beller1-1/+1
2018-05-08merge: pass aggressive when rename detection is turned offLibravatar Ben Peart1-0/+1
2018-05-08merge: add merge.renames config settingLibravatar Ben Peart1-6/+24
2018-05-08merge-recursive: fix check for skipability of working tree updatesLibravatar Elijah Newren1-16/+32
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesLibravatar Elijah Newren1-26/+39
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 13:19:00 +0000