summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2018-08-02Merge branch 'bc/object-id'Libravatar Junio C Hamano1-5/+6
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-18/+19
2018-07-16builtin/merge: switch to use the_hash_algoLibravatar brian m. carlson1-5/+6
2018-06-25Merge branch 'ds/commit-graph-lockfile-fix'Libravatar Junio C Hamano1-3/+4
2018-06-25Merge branch 'nd/commit-util-to-slab'Libravatar Junio C Hamano1-12/+13
2018-06-01Merge branch 'nd/use-opt-int-set-f'Libravatar Junio C Hamano1-3/+3
2018-06-01Merge branch 'nd/command-list'Libravatar Junio C Hamano1-0/+1
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Libravatar Junio C Hamano1-0/+1
2018-05-30Merge branch 'bc/object-id'Libravatar Junio C Hamano1-7/+7
2018-05-30Merge branch 'ma/lockfile-cleanup'Libravatar Junio C Hamano1-2/+2
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2018-05-22merge: check config before loading commitsLibravatar Derrick Stolee1-3/+4
2018-05-21merge: use commit-slab in merge remote desc instead of commit->utilLibravatar Nguyễn Thái Ngọc Duy1-12/+13
2018-05-21Move declaration for alias.c to alias.hLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentLibravatar Stefan Beller1-18/+19
2018-05-18refspec: move refspec parsing logic into its own fileLibravatar Brandon Williams1-0/+1
2018-05-10lock_file: make function-local locks non-staticLibravatar Martin Ågren1-2/+2
2018-05-02builtin/merge: switch tree functions to use object_idLibravatar brian m. carlson1-7/+7
2018-04-11Merge branch 'sb/object-store'Libravatar Junio C Hamano1-1/+1
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesLibravatar Junio C Hamano1-1/+1
2018-04-10Merge branch 'bc/object-id'Libravatar Junio C Hamano1-4/+4
2018-03-26object-store: close all packs upon clearing the object storeLibravatar Stefan Beller1-1/+1
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Libravatar Junio C Hamano1-9/+6
2018-03-14Convert find_unique_abbrev* to struct object_idLibravatar brian m. carlson1-3/+3
2018-03-14cache-tree: convert write_*_as_tree to object_idLibravatar brian m. carlson1-1/+1
2018-03-06Merge branch 'bw/c-plus-plus'Libravatar Junio C Hamano1-1/+1
2018-03-06Merge branch 'jc/allow-ff-merging-kept-tags'Libravatar Junio C Hamano1-4/+39
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexLibravatar Martin Ågren1-9/+6
2018-02-16merge: allow fast-forward when merging a tracked tagLibravatar Junio C Hamano1-4/+39
2018-02-14object: rename function 'typename' to 'type_name'Libravatar Brandon Williams1-1/+1
2018-01-30commit: convert commit_tree* to object_idLibravatar Patryk Obara1-4/+4
2017-12-12merge: add config option for verifySignaturesLibravatar Hans Jerry Illikainen1-0/+2
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Libravatar Junio C Hamano1-0/+1
2017-11-08reduce_heads: fix memory leaksLibravatar Martin Ågren1-0/+1
2017-10-16refs: convert dwim_ref and expand_ref to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idLibravatar brian m. carlson1-7/+6
2017-09-19Merge branch 'rs/strbuf-leakfix'Libravatar Junio C Hamano1-2/+7
2017-09-19Merge branch 'sb/merge-commit-msg-hook'Libravatar Junio C Hamano1-0/+8
2017-09-10Merge branch 'ma/up-to-date'Libravatar Junio C Hamano1-2/+2
2017-09-08builtin/merge: honor commit-msg hook for mergesLibravatar Stefan Beller1-0/+8
2017-09-07merge: release strbuf after use in write_merge_heads()Libravatar Rene Scharfe1-0/+1
2017-09-07merge: release strbuf after use in save_state()Libravatar Rene Scharfe1-2/+6
2017-08-26Merge branch 'mg/killed-merge'Libravatar Junio C Hamano1-3/+12
2017-08-26Merge branch 'jt/packmigrate'Libravatar Junio C Hamano1-0/+1
2017-08-24Merge branch 'lg/merge-signoff'Libravatar Junio C Hamano1-0/+4
2017-08-23pack: move pack-closing functionsLibravatar Jonathan Tan1-0/+1
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ågren1-2/+2
2017-08-23merge: save merge state earlierLibravatar Michael J Gruber1-0/+2
2017-08-23merge: split write_merge_state in twoLibravatar Michael J Gruber1-3/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 10:31:23 +0000