summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-03t6044: verify that merges expected to abort actually abortLibravatar Elijah Newren1-11/+21
2018-07-03index_has_changes(): avoid assuming operating on the_indexLibravatar Elijah Newren4-13/+17
2018-07-03read-cache.c: move index_has_changes() from merge.cLibravatar Elijah Newren2-31/+33
2018-05-22Git 2.17.1Libravatar Junio C Hamano3-2/+18
2018-05-22Merge branch 'jk/submodule-fsck-loose' into maintLibravatar Junio C Hamano8-30/+271
2018-05-22Sync with Git 2.16.4Libravatar Junio C Hamano20-42/+507
2018-05-22Git 2.16.4Libravatar Junio C Hamano3-2/+7
2018-05-22Sync with Git 2.15.2Libravatar Junio C Hamano18-41/+500
2018-05-22Git 2.15.2Libravatar Junio C Hamano2-1/+4
2018-05-22Sync with Git 2.14.4Libravatar Junio C Hamano17-41/+497
2018-05-22Git 2.14.4Libravatar Junio C Hamano3-2/+7
2018-05-22Sync with Git 2.13.7Libravatar Junio C Hamano16-41/+492
2018-05-22Git 2.13.7Libravatar Junio C Hamano3-2/+22
2018-05-22Merge branch 'jk/submodule-fix-loose' into maint-2.13Libravatar Junio C Hamano15-41/+472
2018-05-21fsck: complain when .gitmodules is a symlinkLibravatar Jeff King2-2/+38
2018-05-21index-pack: check .gitmodules files with --strictLibravatar Jeff King3-0/+60
2018-05-21unpack-objects: call fsck_finish() after fscking objectsLibravatar Jeff King2-1/+11
2018-05-21fsck: call fsck_finish() after fscking objectsLibravatar Jeff King2-0/+7
2018-05-21fsck: check .gitmodules contentLibravatar Jeff King1-1/+59
2018-05-21fsck: handle promisor objects in .gitmodules checkLibravatar Jeff King1-0/+3
2018-05-21fsck: detect gitmodules filesLibravatar Jeff King2-0/+65
2018-05-21fsck: actually fsck blob dataLibravatar Jeff King3-24/+28
2018-05-21fsck: simplify ".git" checkLibravatar Jeff King1-3/+1
2018-05-21index-pack: make fsck error message more specificLibravatar Jeff King2-2/+2
2018-05-21Merge branch 'jk/submodule-name-verify-fix' into jk/submodule-name-verify-fsckLibravatar Jeff King16-42/+474
2018-05-21verify_path: disallow symlinks in .gitmodulesLibravatar Jeff King4-15/+37
2018-05-21update-index: stat updated files earlierLibravatar Jeff King1-8/+17
2018-05-21verify_dotfile: mention case-insensitivity in commentLibravatar Jeff King1-1/+4
2018-05-21verify_path: drop clever fallthroughLibravatar Jeff King1-4/+4
2018-05-21skip_prefix: add case-insensitive variantLibravatar Jeff King1-0/+17
2018-05-21is_{hfs,ntfs}_dotgitmodules: add testsLibravatar Johannes Schindelin2-0/+106
2018-05-21is_ntfs_dotgit: match other .git filesLibravatar Johannes Schindelin2-1/+93
2018-05-21is_hfs_dotgit: match other .git filesLibravatar Jeff King2-12/+51
2018-05-21is_ntfs_dotgit: use a size_t for traversing stringLibravatar Jeff King1-1/+1
2018-05-21submodule-config: verify submodule names as pathsLibravatar Jeff King5-0/+143
2018-04-02Git 2.17Libravatar Junio C Hamano1-1/+1
2018-04-02Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano10-22585/+26683
2018-04-02Merge branch 'pw/add-p-single'Libravatar Junio C Hamano1-1/+1
2018-03-31add -p: fix 2.17.0-rc* regression due to moved codeLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2018-03-31l10n: de.po: translate 132 new messagesLibravatar Ralf Thielow1-2093/+2527
2018-03-29Merge branch 'jh/partial-clone'Libravatar Junio C Hamano3-5/+6
2018-03-29upload-pack: disable object filtering when disabled by configLibravatar Jonathan Nieder2-5/+5
2018-03-29l10n: zh_CN: review for git v2.17.0 l10n round 1Libravatar Ray Chen1-5/+5
2018-03-29l10n: zh_CN: for git v2.17.0 l10n round 1Libravatar Jiang Xin1-2066/+2495
2018-03-28Git 2.17-rc2Libravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 04:24:26 +0000