summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu
2019-04-18merge: add scissors line on merge conflictDenton Liu
2019-04-18merge: cleanup messages like commitDenton Liu
2019-03-07Merge branch 'nd/diff-parseopt'Junio C Hamano
2019-01-28parse-options: allow ll_callback with OPTION_CALLBACKNguyễn Thái Ngọc Duy
2019-01-28parse-options: avoid magic return codesNguyễn Thái Ngọc Duy
2019-01-28parse-options: stop abusing 'callback' for lowlevel callbacksNguyễn Thái Ngọc Duy
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2019-01-04Merge branch 'nd/i18n'Junio C Hamano
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Junio C Hamano
2018-11-12sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-11-12parse-options: replace opterror() with optname()Nguyễn Thái Ngọc Duy
2018-11-12alias.c: mark split_cmdline_strerror() strings for translationNguyễn Thái Ngọc Duy
2018-11-07merge: handle --verify-signatures for unborn branchJeff King
2018-11-07merge: extract verify_merge_signature() helperJeff King
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-17Merge branch 'jk/cocci'Junio C Hamano
2018-09-17Merge branch 'ds/reachable'Junio C Hamano
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-08-15Merge branch 'nd/i18n'Junio C Hamano
2018-08-02Merge branch 'js/rebase-merge-octopus'Junio C Hamano
2018-08-02Merge branch 'bc/object-id'Junio C Hamano
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy
2018-07-20commit.h: remove method declarationsDerrick Stolee
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano
2018-07-16builtin/merge: switch to use the_hash_algobrian m. carlson
2018-07-11merge: allow reading the merge commit message from a fileJohannes Schindelin
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 05:35:04 (GMT)