summaryrefslogtreecommitdiffstats
path: root/git-merge-resolve.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2020-03-12Hopefully the final batch before -rc2Junio C Hamano1-0/+21
2020-03-11git-rebase.txt: highlight backend differences with commit rewordingElijah Newren1-0/+10
2020-03-11sequencer: clear state upon dropping a become-empty commitElijah Newren2-0/+10
2020-03-11i18n: unmark a message in rebase.cJiang Xin1-1/+1
2020-03-09Git 2.26-rc1v2.26.0-rc1Junio C Hamano2-1/+28
2020-03-09t1091: don't grep for `strerror()` stringMartin Ågren1-1/+1
2020-03-05Git 2.26-rc0v2.26.0-rc0Junio C Hamano2-1/+41
2020-03-05t5537: adjust test_oid labelJohannes Schindelin1-3/+3
2020-03-04t2402: test worktree path when called in .git directoryHariom Verma1-0/+6
2020-03-03remote: drop "explicit" parameter from remote_ref_for_branch()Jeff King3-15/+5
2020-03-03remote-curl: show progress for fetches over dumb HTTPRené Scharfe3-1/+14
2020-03-03The eighth batch for 2.26Junio C Hamano1-0/+37
2020-03-02show_one_mergetag: print non-parent in hex form.Harald van Dijk2-1/+21
2020-02-28Revert "gpg-interface: prefer check_signature() for GPG verification"Junio C Hamano4-72/+75
2020-02-28config.mak.dev: re-enable -Wformat-zero-lengthJeff King1-1/+0
2020-02-28rebase-interactive.c: silence format-zero-length warningsRalf Thielow1-2/+2
2020-02-27mingw: workaround for hangs when sending STDINAlexandr Miloslavskiy1-28/+3
2020-02-27Documentation: clarify that `-h` alone stands for `help`Junio C Hamano2-1/+8
2020-02-27t6020: new test with interleaved lexicographic ordering of directoriesElijah Newren1-0/+43
2020-02-27t6022, t6046: test expected behavior instead of testing a proxy for itElijah Newren2-34/+70
2020-02-27t3035: prefer test_must_fail to bash negation for git commandsElijah Newren1-2/+2
2020-02-27t6020, t6022, t6035: update merge tests to use test helper functionsElijah Newren3-47/+47
2020-02-27t602[1236], t6034: modernize test formattingElijah Newren5-595/+591
2020-02-27merge-recursive: apply collision handling unification to recursive caseElijah Newren2-114/+77
2020-02-27Azure Pipeline: switch to the latest agent poolsJohannes Schindelin1-12/+25
2020-02-27ci: prevent `perforce` from being quarantinedJohannes Schindelin1-2/+2
2020-02-27t/lib-httpd: avoid using macOS' sedJohannes Schindelin8-59/+66
2020-02-27commit-graph: use progress title directlyRené Scharfe1-6/+2
2020-02-26describe: don't abort too early when searching tagsBenno Evers2-4/+69
2020-02-26builtin/rebase: remove a call to get_oid() on `options.switch_to'Alban Gruin1-9/+1
2020-02-25The seventh batch for 2.26Junio C Hamano1-0/+8
2020-02-25clone: pass --single-branch during --recurse-submodulesEmily Shaffer5-5/+49
2020-02-25submodule--helper: use C99 named initializerEmily Shaffer1-4/+7
2020-02-24lib-log-graph: consolidate colored graph cmp logicAbhishek Kumar4-30/+20
2020-02-24lib-log-graph: consolidate test_cmp_graph logicAbhishek Kumar5-77/+54
2020-02-24worktree: don't allow "add" validation to be fooled by suffix matchingEric Sunshine2-8/+10
2020-02-24worktree: add utility to find worktree by pathnameEric Sunshine2-6/+16
2020-02-24worktree: improve find_worktree() documentationEric Sunshine1-2/+12
2020-02-24packfile: drop nth_packed_object_sha1()Jeff King2-25/+10
2020-02-24packed_object_info(): use object_id internally for delta baseJeff King1-17/+15
2020-02-24packed_object_info(): use object_id for returning delta baseJeff King5-11/+11
2020-02-24pack-check: push oid lookup into loopJeff King1-13/+10
2020-02-24pack-check: convert "internal error" die to a BUG()Jeff King1-1/+2
2020-02-24pack-bitmap: use object_id when loading on-disk bitmapsJeff King1-6/+6
2020-02-24pack-objects: use object_id struct in pack-reuse codeJeff King1-4/+5
2020-02-24pack-objects: convert oe_set_delta_ext() to use object_idJeff King3-4/+4
2020-02-24pack-objects: read delta base oid into object_id structJeff King1-17/+18
2020-02-24nth_packed_object_oid(): use customary integer returnJeff King6-24/+22
2020-02-24worktree: drop unused code from get_main_worktree()Eric Sunshine1-4/+0
2020-02-24blame: provide type of fingerprints pointerRené Scharfe1-1/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 20:32:15 +0100