summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano2018-03-211-9/+6
|\
| * write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-indexMartin Ågren2018-03-011-9/+6
* | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-1/+1
|\ \
| * | object: rename function 'typename' to 'type_name'Brandon Williams2018-02-141-1/+1
* | | Merge branch 'jc/allow-ff-merging-kept-tags'Junio C Hamano2018-03-061-4/+39
|\ \ \ | |_|/ |/| |
| * | merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tagsJunio C Hamano2018-02-161-4/+39
| |/
* | commit: convert commit_tree* to object_idPatryk Obara2018-01-301-4/+4
|/
* merge: add config option for verifySignaturesHans Jerry Illikainen2017-12-121-0/+2
* Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano2017-11-151-0/+1
|\
| * reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-081-0/+1
* | refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-161-1/+1
* | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-161-1/+1
* | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-161-7/+6
|/
* Merge branch 'rs/strbuf-leakfix'Junio C Hamano2017-09-191-2/+7
|\
| * merge: release strbuf after use in write_merge_heads()Rene Scharfe2017-09-071-0/+1
| * merge: release strbuf after use in save_state()Rene Scharfe2017-09-071-2/+6
* | Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano2017-09-191-0/+8
|\ \
| * | builtin/merge: honor commit-msg hook for mergesStefan Beller2017-09-081-0/+8
| |/
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-2/+2
|\ \ | |/ |/|
| * treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-2/+2
* | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-261-3/+12
|\ \
| * | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+2
| * | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| |/
* | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-261-0/+1
|\ \
| * | pack: move pack-closing functionsJonathan Tan2017-08-231-0/+1
* | | Merge branch 'lg/merge-signoff'Junio C Hamano2017-08-241-0/+4
|\ \ \ | |/ / |/| |
| * | merge: add a --signoff flaglg/merge-signoffŁukasz Gryglicki2017-07-251-0/+4
| |/
* | Merge branch 'rs/merge-microcleanup'Junio C Hamano2017-08-221-2/+2
|\ \
| * | merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
* | | Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-221-2/+2
|\ \ \
| * | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-071-2/+2
* | | | use MOVE_ARRAYRené Scharfe2017-07-171-1/+1
| |_|/ |/| |
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| | |/ | |/|
* | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-1/+1
|\ \ \
| * | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-1/+1
* | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-261-3/+1
| |/ /
* | | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-3/+3
* | | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-081-2/+2
* | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-1/+1
|/ /
* | Merge branch 'bc/object-id'Junio C Hamano2017-04-191-1/+1
|\ \
| * | Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson2017-03-261-1/+1
* | | Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano2017-03-301-50/+9
|\ \ \ | |/ / |/| |
| * | merge: drop 'git merge <message> HEAD <commit>' syntaxjc/merge-drop-old-syntaxJunio C Hamano2015-04-291-50/+9
* | | Merge branch 'bc/object-id'Junio C Hamano2017-03-171-68/+66
|\ \ \
| * | | builtin/merge: convert to struct object_idbrian m. carlson2017-02-221-68/+66
| | |/ | |/|
* | | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-141-1/+1
|\ \ \ | |/ / |/| |
| * | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-021-1/+1
View Lorry Controller Status