summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/the-index'Junio C Hamano2019-01-041-1/+1
|\
| * sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | Merge branch 'nd/i18n'Junio C Hamano2019-01-041-2/+2
|\ \
| * | parse-options: replace opterror() with optname()Nguyễn Thái Ngọc Duy2018-11-121-1/+1
| * | alias.c: mark split_cmdline_strerror() strings for translationNguyễn Thái Ngọc Duy2018-11-121-1/+1
| |/
* | Merge branch 'jk/verify-sig-merge-into-void'Junio C Hamano2018-11-181-25/+5
|\ \
| * | merge: handle --verify-signatures for unborn branchJeff King2018-11-071-0/+4
| * | merge: extract verify_merge_signature() helperJeff King2018-11-071-25/+1
* | | assert NOARG/NONEG behavior of parse-options callbacksJeff King2018-11-061-0/+1
| |/ |/|
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-7/+9
|\ \
| * | revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
| * | rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * | merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+5
| * | diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| |/
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-3/+3
|\ \
| * | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-1/+1
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-2/+2
| |/
* | Merge branch 'ds/reachable'Junio C Hamano2018-09-171-0/+1
|\ \ | |/ |/|
| * commit.h: remove method declarationsDerrick Stolee2018-07-211-0/+1
| * Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-18/+19
| |\
* | \ Merge branch 'nd/i18n'Junio C Hamano2018-08-161-1/+1
|\ \ \
| * | | Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-1/+1
| |/ /
* | | Merge branch 'js/rebase-merge-octopus'Junio C Hamano2018-08-031-0/+32
|\ \ \
| * | | merge: allow reading the merge commit message from a fileJohannes Schindelin2018-07-111-0/+32
| |/ /
* | | Merge branch 'bc/object-id'Junio C Hamano2018-08-031-5/+6
|\ \ \
| * | | builtin/merge: switch to use the_hash_algobrian m. carlson2018-07-161-5/+6
| |/ /
* | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-18/+19
|\ \ \ | |/ / |/| / | |/
| * path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-18/+19
* | 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-171-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 indexMartin Ågren2018-03-011-9/+6
| | |/ / | |/| |