summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesLibravatar Elijah Newren2-8/+14
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesLibravatar Elijah Newren2-9/+14
2020-08-10t6423: add an explanation about why one of the tests does not passLibravatar Elijah Newren1-0/+8
2020-08-10t6416, t6423: clarify some comments and fix some typosLibravatar Elijah Newren2-14/+13
2020-08-10t6422: fix multiple errors with the mod6 test expectationsLibravatar Elijah Newren1-9/+10
2020-08-10t6423: fix test setup for a couple testsLibravatar Elijah Newren1-0/+2
2020-08-10t6416, t6422: fix incorrect untracked file countLibravatar Elijah Newren2-3/+3
2020-08-10t6422: fix bad check against missing fileLibravatar Elijah Newren1-3/+3
2020-08-10t6418: tighten delete/normalize conflict testcaseLibravatar Elijah Newren1-1/+2
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren35-0/+0
2020-08-10Fifth batchLibravatar Junio C Hamano1-0/+15
2020-08-10Merge branch 'pb/guide-docs'Libravatar Junio C Hamano9-22/+34
2020-08-10Merge branch 'so/rev-parser-errormessage-fix'Libravatar Junio C Hamano1-1/+1
2020-08-10Merge branch 'en/eol-attrs-gotchas'Libravatar Junio C Hamano4-36/+15
2020-08-10Merge branch 'jk/compiler-fixes-and-workarounds'Libravatar Junio C Hamano2-6/+4
2020-08-10Merge branch 'ny/notes-doc-sample-update'Libravatar Junio C Hamano1-1/+1
2020-08-10Merge branch 'es/adjust-subtree-test-for-merge-msg-update'Libravatar Junio C Hamano1-4/+2
2020-08-10Merge branch 'rs/bisect-oid-to-hex-fix'Libravatar Junio C Hamano1-1/+1
2020-08-10Merge branch 'en/merge-recursive-comment-fixes'Libravatar Junio C Hamano2-9/+9
2020-08-10Merge branch 'ma/t1450-quotefix'Libravatar Junio C Hamano1-1/+1
2020-08-10Merge branch 'es/worktree-cleanup'Libravatar Junio C Hamano1-15/+3
2020-08-10Merge branch 'jk/strvec'Libravatar Junio C Hamano105-1620/+1619
2020-08-04git.txt: add list of guidesLibravatar Philippe Blain3-1/+14
2020-08-04Documentation: don't hardcode command categories twiceLibravatar Junio C Hamano2-13/+9
2020-08-04help: drop usage of 'common' and 'useful' for guidesLibravatar Philippe Blain4-7/+7
2020-08-04command-list.txt: add missing 'gitcredentials' and 'gitremote-helpers'Libravatar Philippe Blain3-1/+4
2020-08-04revision: fix die() message for "--unpacked="Libravatar Sergey Organov1-1/+1
2020-08-04Fourth batchLibravatar Junio C Hamano1-1/+15
2020-08-04Merge branch 'jt/pretend-object-never-come-from-elsewhere'Libravatar Junio C Hamano2-1/+13
2020-08-04Merge branch 'jt/pack-objects-prefetch-in-batch'Libravatar Junio C Hamano2-4/+72
2020-08-04Merge branch 'mp/complete-show-color-moved'Libravatar Junio C Hamano1-0/+8
2020-08-04revision: avoid leak when preparing bloom filter for "/"Libravatar Jeff King1-0/+1
2020-08-04revision: avoid out-of-bounds read/write on empty pathspecLibravatar Jeff King1-5/+2
2020-08-04config: work around gcc-10 -Wstringop-overflow warningLibravatar Jeff King1-1/+1
2020-08-03Revert "contrib: subtree: adjust test to change in fmt-merge-msg"Libravatar Emily Shaffer1-4/+2
2020-08-03docs: improve the example that illustrates git-notes path namesLibravatar Noam Yorav-Raphael1-1/+1
2020-08-03checkout: support renormalization with checkout -m <paths>Libravatar Elijah Newren1-5/+6
2020-08-03merge: make merge.renormalize work for all uses of merge machineryLibravatar Elijah Newren4-13/+5
2020-08-03t6038: remove problematic testLibravatar Elijah Newren1-14/+0
2020-08-03t6038: make tests fail for the right reasonLibravatar Elijah Newren1-4/+4
2020-08-02bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()Libravatar René Scharfe1-1/+1
2020-08-02merge-recursive: fix unclear and outright wrong commentsLibravatar Elijah Newren2-9/+9
2020-08-01t1450: fix quoting of NUL byte when corrupting packLibravatar Martin Ågren1-1/+1
2020-08-01Third batchLibravatar Junio C Hamano1-0/+4
2020-08-01Merge branch 'cc/pretty-contents-size' into masterLibravatar Junio C Hamano1-2/+2
2020-08-01Merge branch 'hn/reftable' into masterLibravatar Junio C Hamano2-2/+3
2020-08-01Merge branch 'jc/fmt-merge-msg-suppress-destination' into masterLibravatar Junio C Hamano30-94/+159
2020-07-31worktree: retire special-case normalization of main worktree pathLibravatar Eric Sunshine1-4/+2
2020-07-31worktree: drop bogus and unnecessary path mungingLibravatar Eric Sunshine1-6/+1
2020-07-31worktree: drop unused code from get_linked_worktree()Libravatar Eric Sunshine1-3/+0