summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-08-13blame: only coalesce lines that are adjacent in resultLibravatar Jeff King2-0/+10
2020-08-13t8003: factor setup out of coalesce testLibravatar Jeff King1-6/+10
2020-08-13t8003: check output of coalesced blameLibravatar Jeff King1-7/+4
2020-08-12rebase: remove unused function reschedule_last_actionLibravatar René Scharfe1-10/+0
2020-08-11Sixth batchLibravatar Junio C Hamano1-0/+11
2020-08-11Merge branch 'ss/cmake-build'Libravatar Junio C Hamano2-15/+1024
2020-08-11Merge branch 'tb/upload-pack-filters'Libravatar Junio C Hamano5-0/+184
2020-08-11Merge branch 'es/worktree-doc-cleanups'Libravatar Junio C Hamano1-61/+62
2020-08-11Merge branch 'bc/sha-256-part-3'Libravatar Junio C Hamano74-351/+633
2020-08-11t/t4013: add test for --diff-merges=offLibravatar Sergey Organov3-0/+158
2020-08-11doc/git-log: describe --diff-merges=offLibravatar Sergey Organov1-1/+5
2020-08-11revision: change "--diff-merges" option to require parameterLibravatar Sergey Organov1-1/+8
2020-08-11t1416: avoid hard-coded sha1 idsLibravatar Jeff King1-2/+3
2020-08-11upload-pack: remove superfluous sigchain_pop() callLibravatar René Scharfe1-1/+0
2020-08-10t6425: be more flexible with rename/delete conflict messagesLibravatar Elijah Newren1-1/+2
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-10progress: don't dereference before checking for NULLLibravatar Martin Ågren1-2/+10
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-09test_cmp: diagnose incorrect argumentsLibravatar Eric Sunshine1-2/+14
2020-08-09diff-lib: use worktree mode in diffs from i-t-a entriesLibravatar Raymond E. Pasco1-1/+2
2020-08-09t4140: test apply with i-t-a pathsLibravatar Raymond E. Pasco1-0/+56
2020-08-09apply: make i-t-a entries never match worktreeLibravatar Raymond E. Pasco1-5/+19
2020-08-07bisect: combine args passed to find_bisection()Libravatar Aaron Lipman3-32/+49
2020-08-07bisect: introduce first-parent flagLibravatar Aaron Lipman4-3/+42
2020-08-07cmd_bisect__helper: defer parsing no-checkout flagLibravatar Aaron Lipman4-13/+10
2020-08-07rev-list: allow bisect and first-parent flagsLibravatar Aaron Lipman7-21/+70
2020-08-07t6030: modernize "git bisect run" testsLibravatar Aaron Lipman1-48/+38
2020-08-07refs: fix interleaving hook calls with reference-transaction hookLibravatar Patrick Steinhardt2-1/+27
2020-08-07sideband: mark "remote error:" prefix for translationLibravatar Jeff King1-1/+1
2020-08-06compat-util: type-check parameters of no-op replacement functionsLibravatar Junio C Hamano1-5/+15
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 20:34:59 +0000