summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-03-02Merge branch 'en/rebase-backend'Libravatar Junio C Hamano25-277/+693
2020-03-02Merge branch 'en/check-ignore'Libravatar Junio C Hamano3-19/+35
2020-03-02Merge branch 'jk/object-filter-with-bitmap'Libravatar Junio C Hamano14-70/+511
2020-03-02Merge branch 'jk/push-option-doc-markup-fix'Libravatar Junio C Hamano1-2/+2
2020-03-02Merge branch 'jk/doc-diff-parallel'Libravatar Junio C Hamano1-1/+1
2020-03-02show_one_mergetag: print non-parent in hex form.Libravatar Harald van Dijk2-1/+21
2020-02-28Revert "gpg-interface: prefer check_signature() for GPG verification"Libravatar Junio C Hamano4-72/+75
2020-02-28config.mak.dev: re-enable -Wformat-zero-lengthLibravatar Jeff King1-1/+0
2020-02-28rebase-interactive.c: silence format-zero-length warningsLibravatar Ralf Thielow1-2/+2
2020-02-27mingw: workaround for hangs when sending STDINLibravatar Alexandr Miloslavskiy1-28/+3
2020-02-27Documentation: clarify that `-h` alone stands for `help`Libravatar Junio C Hamano2-1/+8
2020-02-27t6020: new test with interleaved lexicographic ordering of directoriesLibravatar Elijah Newren1-0/+43
2020-02-27t6022, t6046: test expected behavior instead of testing a proxy for itLibravatar Elijah Newren2-34/+70
2020-02-27t3035: prefer test_must_fail to bash negation for git commandsLibravatar Elijah Newren1-2/+2
2020-02-27t6020, t6022, t6035: update merge tests to use test helper functionsLibravatar Elijah Newren3-47/+47
2020-02-27t602[1236], t6034: modernize test formattingLibravatar Elijah Newren5-595/+591
2020-02-27merge-recursive: apply collision handling unification to recursive caseLibravatar Elijah Newren2-114/+77
2020-02-27Azure Pipeline: switch to the latest agent poolsLibravatar Johannes Schindelin1-12/+25
2020-02-27ci: prevent `perforce` from being quarantinedLibravatar Johannes Schindelin1-2/+2
2020-02-27t/lib-httpd: avoid using macOS' sedLibravatar Johannes Schindelin8-59/+66
2020-02-27commit-graph: use progress title directlyLibravatar René Scharfe1-6/+2
2020-02-26describe: don't abort too early when searching tagsLibravatar Benno Evers2-4/+69
2020-02-26builtin/rebase: remove a call to get_oid() on `options.switch_to'Libravatar Alban Gruin1-9/+1
2020-02-25The seventh batch for 2.26Libravatar Junio C Hamano1-0/+8
2020-02-25Merge branch 'es/doc-mentoring'Libravatar Junio C Hamano1-0/+36
2020-02-25Merge branch 'es/bright-colors'Libravatar Junio C Hamano3-22/+69
2020-02-25Merge branch 'bw/remote-rename-update-config'Libravatar Junio C Hamano12-90/+305
2020-02-25clone: pass --single-branch during --recurse-submodulesLibravatar Emily Shaffer5-5/+49
2020-02-25submodule--helper: use C99 named initializerLibravatar Emily Shaffer1-4/+7
2020-02-24lib-log-graph: consolidate colored graph cmp logicLibravatar Abhishek Kumar4-30/+20
2020-02-24lib-log-graph: consolidate test_cmp_graph logicLibravatar Abhishek Kumar5-77/+54
2020-02-24worktree: don't allow "add" validation to be fooled by suffix matchingLibravatar Eric Sunshine2-8/+10
2020-02-24worktree: add utility to find worktree by pathnameLibravatar Eric Sunshine2-6/+16
2020-02-24worktree: improve find_worktree() documentationLibravatar Eric Sunshine1-2/+12
2020-02-24packfile: drop nth_packed_object_sha1()Libravatar Jeff King2-25/+10
2020-02-24packed_object_info(): use object_id internally for delta baseLibravatar Jeff King1-17/+15
2020-02-24packed_object_info(): use object_id for returning delta baseLibravatar Jeff King5-11/+11
2020-02-24pack-check: push oid lookup into loopLibravatar Jeff King1-13/+10
2020-02-24pack-check: convert "internal error" die to a BUG()Libravatar Jeff King1-1/+2
2020-02-24pack-bitmap: use object_id when loading on-disk bitmapsLibravatar Jeff King1-6/+6
2020-02-24pack-objects: use object_id struct in pack-reuse codeLibravatar Jeff King1-4/+5
2020-02-24pack-objects: convert oe_set_delta_ext() to use object_idLibravatar Jeff King3-4/+4
2020-02-24pack-objects: read delta base oid into object_id structLibravatar Jeff King1-17/+18
2020-02-24nth_packed_object_oid(): use customary integer returnLibravatar Jeff King6-24/+22
2020-02-24worktree: drop unused code from get_main_worktree()Libravatar Eric Sunshine1-4/+0
2020-02-24blame: provide type of fingerprints pointerLibravatar René Scharfe1-1/+3
2020-02-24rebase: refuse to switch to branch already checked out elsewhereLibravatar Eric Sunshine2-2/+21
2020-02-24t3400: make test clean up after itselfLibravatar Eric Sunshine1-1/+1
2020-02-24t: drop debug `cat` callsLibravatar Martin Ågren11-13/+2
2020-02-24t9810: drop debug `cat` callLibravatar Martin Ågren1-1/+0