summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-06-25Merge branch 'ds/commit-graph-lockfile-fix'Junio C Hamano
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano
2018-06-01Merge branch 'nd/use-opt-int-set-f'Junio C Hamano
2018-06-01Merge branch 'nd/command-list'Junio C Hamano
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano
2018-05-30Merge branch 'bc/object-id'Junio C Hamano
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy
2018-05-22merge: check config before loading commitsDerrick Stolee
2018-05-21merge: use commit-slab in merge remote desc instead of commit->utilNguyễn Thái Ngọc Duy
2018-05-21Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy
2018-05-17path.c: migrate global git_path_* to take a repository argumentStefan Beller
2018-05-17refspec: move refspec parsing logic into its own fileBrandon Williams
2018-05-10lock_file: make function-local locks non-staticMartin Ågren
2018-05-02builtin/merge: switch tree functions to use object_idbrian m. carlson
2018-04-11Merge branch 'sb/object-store'Junio C Hamano
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano
2018-04-09Merge branch 'bc/object-id'Junio C Hamano
2018-03-26object-store: close all packs upon clearing the object storeStefan Beller
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson
2018-03-14cache-tree: convert write_*_as_tree to object_idbrian m. carlson
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano
2018-03-06Merge branch 'jc/allow-ff-merging-kept-tags'Junio C Hamano
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren
2018-02-16merge: allow fast-forward when merging a tracked tagJunio C Hamano
2018-02-14object: rename function 'typename' to 'type_name'Brandon Williams
2018-01-30commit: convert commit_tree* to object_idPatryk Obara
2017-12-12merge: add config option for verifySignaturesHans Jerry Illikainen
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano
2017-11-08reduce_heads: fix memory leaksMartin Ågren
2017-10-16refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson
2017-09-19Merge branch 'rs/strbuf-leakfix'Junio C Hamano
2017-09-19Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano
2017-09-08builtin/merge: honor commit-msg hook for mergesStefan Beller
2017-09-06merge: release strbuf after use in write_merge_heads()Rene Scharfe
2017-09-06merge: release strbuf after use in save_state()Rene Scharfe
2017-08-27Merge branch 'mg/killed-merge'Junio C Hamano
2017-08-27Merge branch 'jt/packmigrate'Junio C Hamano
2017-08-24Merge branch 'lg/merge-signoff'Junio C Hamano
2017-08-23pack: move pack-closing functionsJonathan Tan
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren
2017-08-23merge: save merge state earlierMichael J Gruber
2017-08-23merge: split write_merge_state in twoMichael J Gruber
2017-08-23merge: clarify call chainMichael J Gruber
2017-08-22Merge branch 'rs/merge-microcleanup'Junio C Hamano