summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2019-10-07Merge branch 'tg/stash-refresh-index'Junio C Hamano1-10/+3
2019-09-20merge: use refresh_and_write_cacheThomas Gummerer1-10/+3
2019-08-07merge: --no-verify to bypass pre-merge-commit hookMichael J Gruber1-2/+2
2019-08-07git-merge: honor pre-merge-commit hookMichael J Gruber1-0/+12
2019-08-07merge: do no-verify like commitMichael J Gruber1-3/+3
2019-07-19Merge branch 'ea/merge-code-cleanup'Junio C Hamano1-33/+20
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano1-1/+1
2019-07-09builtin/merge.c - cleanup of code in for-cycle that tests strategiesEdmundo Carmona Antoranz1-33/+20
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano1-1/+11
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano1-12/+18
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee1-1/+1
2019-05-28merge: refuse --commit with --squashVishal Verma1-1/+11
2019-05-19merge: add --quitNguyễn Thái Ngọc Duy1-0/+13
2019-05-13merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy1-12/+5
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu1-8/+2
2019-04-18merge: add scissors line on merge conflictDenton Liu1-0/+14
2019-04-18merge: cleanup messages like commitDenton Liu1-10/+31
2019-03-07Merge branch 'nd/diff-parseopt'Junio C Hamano1-3/+6
2019-01-27parse-options: allow ll_callback with OPTION_CALLBACKNguyễn Thái Ngọc Duy1-0/+2
2019-01-27parse-options: avoid magic return codesNguyễn Thái Ngọc Duy1-2/+3
2019-01-27parse-options: stop abusing 'callback' for lowlevel callbacksNguyễn Thái Ngọc Duy1-1/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-1/+1
2019-01-04Merge branch 'nd/i18n'Junio C Hamano1-2/+2
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Junio C Hamano1-25/+5
2018-11-12sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-11-12parse-options: replace opterror() with optname()Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12alias.c: mark split_cmdline_strerror() strings for translationNguyễn Thái Ngọc Duy1-1/+1
2018-11-07merge: handle --verify-signatures for unborn branchJeff King1-0/+4
2018-11-07merge: extract verify_merge_signature() helperJeff King1-25/+1
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King1-0/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-7/+9
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+5
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-3/+3
2018-09-17Merge branch 'ds/reachable'Junio C Hamano1-0/+1
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-2/+2
2018-08-15Merge branch 'nd/i18n'Junio C Hamano1-1/+1
2018-08-02Merge branch 'js/rebase-merge-octopus'Junio C Hamano1-0/+32
2018-08-02Merge branch 'bc/object-id'Junio C Hamano1-5/+6
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy1-1/+1
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-18/+19
2018-07-16builtin/merge: switch to use the_hash_algobrian m. carlson1-5/+6
2018-07-11merge: allow reading the merge commit message from a fileJohannes Schindelin1-0/+32
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-18/+19
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-04 18:34:00 +0000