summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-07-11builtin/receive-pack: use check_signature from gpg-interfaceLibravatar Henning Schild1-15/+2
2018-07-11t7405: verify 'merge --abort' works after submodule/path conflictsLibravatar Elijah Newren1-0/+31
2018-07-11t7405: add a directory/submodule conflictLibravatar Elijah Newren1-0/+88
2018-07-11t7405: add a file/submodule conflictLibravatar Elijah Newren1-0/+54
2018-07-11merge: fix misleading pre-merge check documentationLibravatar Elijah Newren1-3/+3
2018-07-11merge-recursive: enforce rule that index matches head before mergingLibravatar Elijah Newren4-137/+18
2018-07-11t6044: add more testcases with staged changes before a merge is invokedLibravatar Elijah Newren1-0/+29
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADLibravatar Elijah Newren5-13/+21
2018-07-11merge-recursive: make sure when we say we abort that we actually abortLibravatar Elijah Newren2-3/+3
2018-07-11t6044: add a testcase for index matching head, when head doesn't match HEADLibravatar Elijah Newren1-0/+11
2018-07-11unpack-trees: do not fail reset because of unmerged skipped entryLibravatar Max Kirillov2-1/+60
2018-07-11t6036: add a failed conflict detection case: regular files, different modesLibravatar Elijah Newren1-0/+67
2018-07-11sequencer: don't say BUG on bogus inputLibravatar Jeff King1-2/+4
2018-07-11sequencer: handle empty-set cases consistentlyLibravatar Jeff King2-3/+10
2018-07-10convert log_ref_write_fd() to use strbufLibravatar Ben Peart3-31/+17
2018-07-09utf8.c: avoid char overflowLibravatar Beat Bolli1-4/+4
2018-07-09string-list.c: avoid conversion from void * to function pointerLibravatar Beat Bolli1-4/+14
2018-07-09sequencer.c: avoid empty statements at top levelLibravatar Beat Bolli2-3/+3
2018-07-09convert.c: replace "\e" escapes with "\033".Libravatar Beat Bolli1-1/+1
2018-07-09fixup! refs/refs-internal.h: avoid forward declaration of an enumLibravatar Junio C Hamano1-1/+1
2018-07-09refs/refs-internal.h: avoid forward declaration of an enumLibravatar Beat Bolli1-0/+2
2018-07-09fixup! connect.h: avoid forward declaration of an enumLibravatar Junio C Hamano1-1/+1
2018-07-09connect.h: avoid forward declaration of an enumLibravatar Beat Bolli1-0/+2
2018-07-09gc --auto: release pack files before auto packingLibravatar Kim Gybels2-0/+3
2018-07-09grep.c: teach 'git grep --only-matching'Libravatar Taylor Blau5-17/+63
2018-07-09unicode: update the width tables to Unicode 11Libravatar Beat Bolli1-13/+28
2018-07-09clone: check connectivity even if clone is partialLibravatar Jonathan Tan2-1/+49
2018-07-09upload-pack: send refs' objects despite "filter"Libravatar Jonathan Tan7-6/+42
2018-07-09docs: correct RFC specifying email line lengthLibravatar brian m. carlson1-1/+1
2018-07-09send-email: automatically determine transfer-encodingLibravatar brian m. carlson3-14/+28
2018-07-09send-email: accept long lines with suitable transfer encodingLibravatar brian m. carlson3-9/+29
2018-07-09send-email: add an auto option for transfer encodingLibravatar brian m. carlson3-9/+37
2018-07-06userdiff: support new keywords in PHP hunk headerLibravatar Kana Natsuno5-1/+20
2018-07-06t4018: add missing test cases for PHPLibravatar Kana Natsuno3-0/+15
2018-07-06t6036: add lots of detail for directory/file conflicts in recursive caseLibravatar Elijah Newren1-55/+201
2018-07-06builtin/config: work around an unsized array forward declarationLibravatar Beat Bolli1-12/+15
2018-07-06git-rebase--preserve-merges: fix formatting of todo help messageLibravatar Tobias Klauser1-2/+2
2018-07-06t5500: prettify non-commit tag testsLibravatar Jeff King1-6/+13
2018-07-06fast-import: do not call diff_delta() with empty bufferLibravatar Mike Hommey1-1/+1
2018-07-03grep.c: extract show_line_header()Libravatar Taylor Blau1-19/+25
2018-07-03fetch-pack: support negotiation tip whitelistLibravatar Jonathan Tan8-2/+176
2018-07-03fetch-pack: write shallow, then check connectivityLibravatar Jonathan Tan8-7/+122
2018-07-03ref-filter: avoid backend filtering with --ignore-caseLibravatar Jeff King2-1/+10
2018-07-03for-each-ref: consistently pass WM_IGNORECASE flagLibravatar Aleksandr Makarov1-1/+1
2018-07-03t6300: add a test for --ignore-caseLibravatar Jeff King1-0/+11
2018-07-03t6042: add testcase covering long chains of rename conflictsLibravatar Elijah Newren1-0/+111
2018-07-03t6042: add testcase covering rename/rename(2to1)/delete/delete conflictLibravatar Elijah Newren1-0/+68
2018-07-03t6042: add testcase covering rename/add/delete conflict typeLibravatar Elijah Newren1-0/+66
2018-07-03t6036: add a failed conflict detection case with conflicting typesLibravatar Elijah Newren1-0/+75
2018-07-03t6036: add a failed conflict detection case with submodule add/addLibravatar Elijah Newren1-0/+88
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 22:25:08 +0000