summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
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-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
2017-08-22Merge branch 'ma/parse-maybe-bool'Junio C Hamano
2017-08-10merge: use skip_prefix()René Scharfe
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren
2017-07-25merge: add a --signoff flagŁukasz Gryglicki
2017-07-17use MOVE_ARRAYRené Scharfe
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-19Merge branch 'bw/object-id'Junio C Hamano
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson
2017-04-20Merge branch 'bc/object-id'Junio C Hamano
2017-03-30Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano
2017-03-27Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson
2017-03-17Merge branch 'bc/object-id'Junio C Hamano
2017-03-14Merge branch 'jk/interpret-branch-name'Junio C Hamano
2017-03-02interpret_branch_name: allow callers to restrict expansionsJeff King
2017-02-22builtin/merge: convert to struct object_idbrian m. carlson
2016-12-27Merge branch 'cp/merge-continue'Junio C Hamano