summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-09-29merge-recursive: Delay content merging for renamesLibravatar Elijah Newren1-1/+1
2010-09-29merge-recursive: Move handling of double rename of one file to twoLibravatar Elijah Newren1-1/+1
2010-09-29merge-recursive: Avoid doubly merging rename/add conflict contentsLibravatar Elijah Newren1-2/+2
2010-09-29t6036: Add testcase for undetected conflictLibravatar Elijah Newren1-0/+85
2010-09-29t6036: Add a second testcase similar to the first but with content changesLibravatar Elijah Newren1-0/+76
2010-09-29t6036: Test index and worktree state, not just that merge failsLibravatar Elijah Newren1-3/+21
2010-09-29t6020: Add a testcase for modify/delete + directory/file conflictLibravatar Elijah Newren1-0/+47
2010-09-29t6020: Modernize style a bitLibravatar Elijah Newren1-15/+20
2010-09-29t6022: Add tests for rename/rename combined with D/F conflictsLibravatar Elijah Newren1-0/+79
2010-09-29t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Libravatar Elijah Newren1-0/+63
2010-09-29t6022: Add tests with both rename source & dest involved in D/F conflictsLibravatar Elijah Newren1-0/+38
2010-09-29t6022: Add tests for reversing order of merges when D/F conflicts presentLibravatar Elijah Newren1-0/+58
2010-09-29t6022: Add test combinations of {content conflict?, D/F conflict remains?}Libravatar Elijah Newren1-0/+128
2010-09-29t6032: Add a test checking for excessive output from mergeLibravatar Elijah Newren1-0/+30
2010-09-29t3030: Add a testcase for resolvable rename/add conflict with symlinksLibravatar Schalk, Ken1-1/+36
2010-09-29Merge branch 'en/rename-d-f' into en/merge-recursiveLibravatar Junio C Hamano1-0/+66
2010-09-29blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Libravatar Kirill Smelkov2-8/+4
2010-09-29blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinksLibravatar Kirill Smelkov2-0/+78
2010-09-29blame,cat-file: Prepare --textconv tests for correctly-failing conversion pro...Libravatar Kirill Smelkov2-12/+14
2010-09-29Merge branch 'tr/send-email-refuse-sending-unedited-cover-letter'Libravatar Junio C Hamano1-0/+36
2010-09-29Merge branch 'jc/grep-header-all-match-fix'Libravatar Junio C Hamano1-1/+28
2010-09-29Merge branch 'jn/gitweb-test-lib'Libravatar Junio C Hamano1-6/+6
2010-09-29Merge branch 'bc/fortran-userdiff'Libravatar Junio C Hamano1-1/+1
2010-09-29Merge branch 'rr/format-patch-count-without-merges'Libravatar Junio C Hamano1-0/+21
2010-09-29Merge branch 'jc/pickaxe-grep'Libravatar Junio C Hamano4-0/+55
2010-09-29Merge branch 'rr/fmt-merge-msg'Libravatar Junio C Hamano1-0/+91
2010-09-29Merge branch 'po/etc-gitattributes'Libravatar Junio C Hamano1-0/+13
2010-09-29send-email: Use To: headers in patch filesLibravatar Stephen Boyd1-0/+24
2010-09-29stash: fix git stash branch regression when branch creation failsLibravatar Jon Seymour1-1/+1
2010-09-29stash drops the stash even if creating the branch fails because it already ex...Libravatar Tomas Carnecky1-0/+11
2010-09-27perl: bump the required Perl version to 5.8 from 5.6.[21]Libravatar Ævar Arnfjörð Bjarmason2-1/+2
2010-09-27git-send-email.perl: Add --to-cmdLibravatar Joe Perches1-0/+18
2010-09-27t6050 (replace): fix bogus "fetch branch with replacement" testLibravatar Christian Couder1-3/+10
2010-09-27smart-http: Don't change POST to GET when following redirectLibravatar Tay Ray Chuan2-0/+15
2010-09-27prefer test -h over test -L in shell scriptsLibravatar Jeff King2-4/+4
2010-09-27t1503: Fix arithmetic expansion syntax error when using dashLibravatar Ramsay Jones1-2/+2
2010-09-27builtin/revert.c: don't dereference a NULL pointerLibravatar Brandon Casey1-0/+10
2010-09-26git-stash: fix flag parsingLibravatar Brian Gernhardt1-4/+4
2010-09-26t/t3903-stash: improve testing of git-stash showLibravatar Brandon Casey1-4/+58
2010-09-24git-svn: check_cherry_pick should exclude commits already in our historyLibravatar Steven Walter1-0/+50
2010-09-23add rebase patch id testsLibravatar Clemens Buchacher1-0/+109
2010-09-23diff: don't use pathname-based diff drivers for symlinksLibravatar Jeff King1-0/+26
2010-09-17t/t7300: workaround ancient touch by rearranging argumentsLibravatar Brandon Casey1-1/+1
2010-09-16Merge branch 'bg/fix-t7003'Libravatar Junio C Hamano1-38/+41
2010-09-15Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'Libravatar Junio C Hamano1-0/+9
2010-09-15Merge branch 'jl/fix-test'Libravatar Junio C Hamano35-491/+604
2010-09-15Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'Libravatar Junio C Hamano1-0/+18
2010-09-15Merge branch 'ch/maint-cannot-create-bundle-error'Libravatar Junio C Hamano1-0/+7
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Libravatar Junio C Hamano1-0/+35
2010-09-13t7003: Use test_commit instead of custom functionLibravatar Brian Gernhardt1-38/+41
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 03:42:04 +0000