summaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ds/commit-graph-lockfile-fix'Junio C Hamano2018-06-251-3/+4
|\
| * merge: check config before loading commitsDerrick Stolee2018-05-221-3/+4
| * Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano2018-04-111-1/+1
| |\
* | \ Merge branch 'nd/commit-util-to-slab'Junio C Hamano2018-06-251-12/+13
|\ \ \
| * | | merge: use commit-slab in merge remote desc instead of commit->utilNguyễn Thái Ngọc Duy2018-05-211-12/+13
* | | | Merge branch 'nd/use-opt-int-set-f'Junio C Hamano2018-06-011-3/+3
|\ \ \ \
| * | | | Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy2018-05-241-3/+3
| |/ / /
* | | | Merge branch 'nd/command-list'Junio C Hamano2018-06-011-0/+1
|\ \ \ \
| * | | | Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy2018-05-211-0/+1
| |/ / /
* | | | Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano2018-05-301-0/+1
|\ \ \ \
| * | | | refspec: move refspec parsing logic into its own fileBrandon Williams2018-05-181-0/+1
| |/ / /
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-7/+7
|\ \ \ \
| * | | | builtin/merge: switch tree functions to use object_idbrian m. carlson2018-05-021-7/+7
| |/ / /
* | | | Merge branch 'ma/lockfile-cleanup'Junio C Hamano2018-05-301-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | lock_file: make function-local locks non-staticMartin Ågren2018-05-101-2/+2
* | | | Merge branch 'sb/object-store'Junio C Hamano2018-04-111-1/+1
|\ \ \ \
| * | | | object-store: close all packs upon clearing the object storeStefan Beller2018-03-261-1/+1
* | | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-3/+3
| * | | | cache-tree: convert write_*_as_tree to object_idbrian m. carlson2018-03-141-1/+1
* | | | | 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