summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Libravatar Junio C Hamano1-25/+5
2018-11-07merge: handle --verify-signatures for unborn branchLibravatar Jeff King1-0/+4
2018-11-07merge: extract verify_merge_signature() helperLibravatar Jeff King1-25/+1
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King1-0/+1
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-7/+9
2018-09-21revision.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-09-21rerere.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-21merge.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-3/+5
2018-09-21diff.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-17Merge branch 'jk/cocci'Libravatar Junio C Hamano1-3/+3
2018-09-17Merge branch 'ds/reachable'Libravatar Junio C Hamano1-0/+1
2018-08-29convert "oidcmp() != 0" to "!oideq()"Libravatar Jeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King1-2/+2
2018-08-15Merge branch 'nd/i18n'Libravatar Junio C Hamano1-1/+1
2018-08-02Merge branch 'js/rebase-merge-octopus'Libravatar Junio C Hamano1-0/+32
2018-08-02Merge branch 'bc/object-id'Libravatar Junio C Hamano1-5/+6
2018-07-23Update messages in preparation for i18nLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-07-20commit.h: remove method declarationsLibravatar Derrick Stolee1-0/+1
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-07-11merge: allow reading the merge commit message from a fileLibravatar Johannes Schindelin1-0/+32
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupLibravatar Junio C Hamano1-18/+19
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 23:08:53 +0000