summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2018-11-02Merge branch 'en/merge-cleanup-more'Junio C Hamano
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren
2018-10-18merge-recursive: improve auto-merging messages with path collisionsElijah Newren
2018-10-16Merge branch 'en/merge-cleanup'Junio C Hamano
2018-09-24Merge branch 'en/double-semicolon-fix'Junio C Hamano
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-20merge-recursive: rename merge_file_1() and merge_content()Elijah Newren
2018-09-20merge-recursive: remove final remaining caller of merge_file_one()Elijah Newren
2018-09-20merge-recursive: avoid wrapper function when unnecessary and wastefulElijah Newren
2018-09-20merge-recursive: set paths correctly when three-way merging contentElijah Newren
2018-09-17Merge branch 'jk/cocci'Junio C Hamano
2018-09-17Merge branch 'ds/reachable'Junio C Hamano
2018-09-05Remove superfluous trailing semicolonsElijah Newren
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano
2018-08-30merge-recursive: add ability to turn off directory rename detectionElijah Newren
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano
2018-08-15Merge branch 'en/merge-recursive-skip-fix'Junio C Hamano
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano
2018-07-27merge-recursive: preserve skip_worktree bit when necessaryElijah Newren
2018-07-20commit.h: remove method declarationsDerrick Stolee
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano
2018-07-18Merge branch 'en/merge-recursive-cleanup'Junio C Hamano
2018-07-11merge-recursive: enforce rule that index matches head before mergingElijah Newren
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADElijah Newren
2018-07-11merge-recursive: make sure when we say we abort that we actually abortElijah Newren
2018-07-03index_has_changes(): avoid assuming operating on the_indexElijah Newren
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller
2018-07-03read-cache: teach refresh_cache_entry to take istateJameson Miller
2018-06-29tag: add repository argument to deref_tagStefan Beller
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller
2018-06-29tree: add repository argument to lookup_treeStefan Beller
2018-06-29object: add repository argument to parse_objectStefan Beller
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-06-25Merge branch 'sb/object-store-alloc'Junio C Hamano
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano
2018-06-18Merge branch 'en/rename-directory-detection'Junio C Hamano
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano
2018-06-12merge-recursive: add pointer about unduly complex looking codeElijah Newren
2018-06-12merge-recursive: rename conflict_rename_*() family of functionsElijah Newren
2018-06-12merge-recursive: clarify the rename_dir/RENAME_DIR meaningElijah Newren
2018-06-12merge-recursive: align labels with their respective code blocksElijah Newren
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 23:46:24 (GMT)