summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-08-19Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Libravatar Junio C Hamano2-2/+9
2020-08-19Merge branch 'en/sequencer-merge-labels'Libravatar Junio C Hamano3-12/+12
2020-08-19Merge branch 'rs/preserve-merges-unused-code-removal'Libravatar Junio C Hamano1-10/+0
2020-08-19Merge branch 'rs/upload-pack-sigchain-fix'Libravatar Junio C Hamano1-1/+0
2020-08-19Merge branch 'rp/ita-diff-modefix'Libravatar Junio C Hamano1-1/+2
2020-08-19Merge branch 'en/merge-tests'Libravatar Junio C Hamano35-48/+71
2020-08-17Eighth batchLibravatar Junio C Hamano1-0/+36
2020-08-17Merge branch 'so/log-diff-merges-opt'Libravatar Junio C Hamano5-2/+171
2020-08-17Merge branch 'jk/log-fp-implies-m'Libravatar Junio C Hamano9-55/+158
2020-08-17Merge branch 'ma/stop-progress-null-fix'Libravatar Junio C Hamano1-2/+10
2020-08-17Merge branch 'es/test-cmp-typocatcher'Libravatar Junio C Hamano1-2/+14
2020-08-17Merge branch 'rp/apply-cached-with-i-t-a'Libravatar Junio C Hamano2-4/+77
2020-08-17Merge branch 'al/bisect-first-parent'Libravatar Junio C Hamano11-103/+195
2020-08-17Merge branch 'jk/sideband-error-l10n'Libravatar Junio C Hamano1-1/+1
2020-08-17Merge branch 'jc/noop-with-static-inline'Libravatar Junio C Hamano1-5/+15
2020-08-17Merge branch 'pd/mergetool-nvimdiff'Libravatar Junio C Hamano9-18/+51
2020-08-17Merge branch 'hn/reftable-prep-part-2'Libravatar Junio C Hamano4-139/+36
2020-08-17Merge branch 'dd/send-email-config'Libravatar Junio C Hamano4-0/+68
2020-08-17Merge branch 'ps/ref-transaction-hook'Libravatar Junio C Hamano2-1/+28
2020-08-14sequencer: avoid garbled merge machinery messages due to commit labelsLibravatar Elijah Newren3-12/+12
2020-08-13Seventh batchLibravatar Junio C Hamano1-0/+9
2020-08-13Merge branch 'rp/blame-first-parent-doc'Libravatar Junio C Hamano1-0/+6
2020-08-13Merge branch 'ma/test-quote-cleanup'Libravatar Junio C Hamano18-80/+53
2020-08-13Merge branch 'jt/has_object'Libravatar Junio C Hamano7-10/+62
2020-08-13Merge branch 'bc/sha-256-cvs-svn-updates'Libravatar Junio C Hamano1-1/+1
2020-08-13rebase -i: fix possibly wrong onto hash in todoLibravatar Antti Keränen2-2/+9
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 14:10:59 +0000