Age | Commit message (Expand) | Author | Files | Lines |
2019-10-07 | Merge branch 'tg/stash-refresh-index' | Junio C Hamano | 1 | -10/+3 |
2019-09-20 | merge: use refresh_and_write_cache | Thomas Gummerer | 1 | -10/+3 |
2019-08-07 | merge: --no-verify to bypass pre-merge-commit hook | Michael J Gruber | 1 | -2/+2 |
2019-08-07 | git-merge: honor pre-merge-commit hook | Michael J Gruber | 1 | -0/+12 |
2019-08-07 | merge: do no-verify like commit | Michael J Gruber | 1 | -3/+3 |
2019-07-19 | Merge branch 'ea/merge-code-cleanup' | Junio C Hamano | 1 | -33/+20 |
2019-07-09 | Merge branch 'ds/close-object-store' | Junio C Hamano | 1 | -1/+1 |
2019-07-09 | builtin/merge.c - cleanup of code in for-cycle that tests strategies | Edmundo Carmona Antoranz | 1 | -33/+20 |
2019-06-17 | Merge branch 'vv/merge-squash-with-explicit-commit' | Junio C Hamano | 1 | -1/+11 |
2019-06-13 | Merge branch 'nd/merge-quit' | Junio C Hamano | 1 | -12/+18 |
2019-06-12 | packfile: rename close_all_packs to close_object_store | Derrick Stolee | 1 | -1/+1 |
2019-05-28 | merge: refuse --commit with --squash | Vishal Verma | 1 | -1/+11 |
2019-05-19 | merge: add --quit | Nguyễn Thái Ngọc Duy | 1 | -0/+13 |
2019-05-13 | merge: remove drop_save() in favor of remove_merge_branch_state() | Nguyễn Thái Ngọc Duy | 1 | -12/+5 |
2019-04-19 | cherry-pick/revert: add scissors line on merge conflict | Denton Liu | 1 | -8/+2 |
2019-04-18 | merge: add scissors line on merge conflict | Denton Liu | 1 | -0/+14 |
2019-04-18 | merge: cleanup messages like commit | Denton Liu | 1 | -10/+31 |
2019-03-07 | Merge branch 'nd/diff-parseopt' | Junio C Hamano | 1 | -3/+6 |
2019-01-27 | parse-options: allow ll_callback with OPTION_CALLBACK | Nguyễn Thái Ngọc Duy | 1 | -0/+2 |
2019-01-27 | parse-options: avoid magic return codes | Nguyễn Thái Ngọc Duy | 1 | -2/+3 |
2019-01-27 | parse-options: stop abusing 'callback' for lowlevel callbacks | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2019-01-24 | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch | Nguyễn Thái Ngọc Duy | 1 | -0/+1 |
2019-01-14 | merge-recursive.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2019-01-04 | Merge branch 'nd/the-index' | Junio C Hamano | 1 | -1/+1 |
2019-01-04 | Merge branch 'nd/i18n' | Junio C Hamano | 1 | -2/+2 |
2018-11-18 | Merge branch 'jk/verify-sig-merge-into-void' | Junio C Hamano | 1 | -25/+5 |
2018-11-12 | sequencer.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-11-12 | parse-options: replace opterror() with optname() | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-11-12 | alias.c: mark split_cmdline_strerror() strings for translation | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-11-07 | merge: handle --verify-signatures for unborn branch | Jeff King | 1 | -0/+4 |
2018-11-07 | merge: extract verify_merge_signature() helper | Jeff King | 1 | -25/+1 |
2018-11-06 | assert NOARG/NONEG behavior of parse-options callbacks | Jeff King | 1 | -0/+1 |
2018-10-19 | Merge branch 'nd/the-index' | Junio C Hamano | 1 | -7/+9 |
2018-09-21 | revision.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
2018-09-21 | rerere.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-09-21 | merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -3/+5 |
2018-09-21 | diff.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-09-17 | Merge branch 'jk/cocci' | Junio C Hamano | 1 | -3/+3 |
2018-09-17 | Merge branch 'ds/reachable' | Junio C Hamano | 1 | -0/+1 |
2018-08-29 | convert "oidcmp() != 0" to "!oideq()" | Jeff King | 1 | -1/+1 |
2018-08-29 | convert "oidcmp() == 0" to oideq() | Jeff King | 1 | -2/+2 |
2018-08-15 | Merge branch 'nd/i18n' | Junio C Hamano | 1 | -1/+1 |
2018-08-02 | Merge branch 'js/rebase-merge-octopus' | Junio C Hamano | 1 | -0/+32 |
2018-08-02 | Merge branch 'bc/object-id' | Junio C Hamano | 1 | -5/+6 |
2018-07-23 | Update messages in preparation for i18n | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2018-07-20 | commit.h: remove method declarations | Derrick Stolee | 1 | -0/+1 |
2018-07-18 | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 1 | -18/+19 |
2018-07-16 | builtin/merge: switch to use the_hash_algo | brian m. carlson | 1 | -5/+6 |
2018-07-11 | merge: allow reading the merge commit message from a file | Johannes Schindelin | 1 | -0/+32 |
2018-06-29 | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 1 | -18/+19 |