summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-11-17git notes merge: Add testcases for merging notes trees at different fanoutsLibravatar Johan Herland1-0/+436
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-0/+145
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland1-0/+76
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-0/+12
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-0/+176
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-0/+292
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-0/+502
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-0/+188
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+180
2010-11-17notes.c: Use two newlines (instead of one) when concatenating notesLibravatar Johan Herland4-0/+11
2010-11-17(trivial) t3303: Indent with tabs instead of spaces for consistencyLibravatar Johan Herland1-9/+9
2010-11-17Fix username and password extraction from HTTP URLsLibravatar Gabriel Corona1-1/+1
2010-11-17t5550: test HTTP authentication and userinfo decodingLibravatar Gabriel Corona4-0/+40
2010-11-17allow command-specific pagers in pager.<cmd>Libravatar Jeff King1-0/+29
2010-11-17log.decorate: accept 0/1 bool valuesLibravatar Jeff King1-0/+9
2010-11-15use persistent memory for rejected pathsLibravatar Clemens Buchacher2-11/+24
2010-11-15do not overwrite untracked during merge from unborn branchLibravatar Clemens Buchacher1-0/+16
2010-11-14tests: use test_cmp instead of piping to diff(1)Libravatar Ævar Arnfjörð Bjarmason2-47/+94
2010-11-14t7004-tag.sh: re-arrange git tag comment for clarityLibravatar Ævar Arnfjörð Bjarmason1-5/+15
2010-11-12git-send-email.perl: make initial In-Reply-To apply only to first emailLibravatar Antonio Ospite1-1/+3
2010-11-11t3402: test "rebase -s<strategy> -X<opt>"Libravatar Junio C Hamano1-0/+21
2010-11-10tag: recognize rfc1991 signaturesLibravatar Michael J Gruber1-6/+6
2010-11-10t/t7004-tag: test handling of rfc1991 signaturesLibravatar Michael J Gruber1-0/+66
2010-11-10cherry-pick/revert: transparently refresh indexLibravatar Jonathan Nieder1-0/+10
2010-11-10apply: handle patches with funny filename and colon in timezoneLibravatar Jonathan Nieder3-0/+26
2010-11-09t4124 (apply --whitespace): use test_might_failLibravatar Jonathan Nieder1-3/+2
2010-11-09t3404: do not use 'describe' to implement test_cmp_revLibravatar Junio C Hamano1-2/+2
2010-11-09t3404 (rebase -i): introduce helper to check position of HEADLibravatar Jonathan Nieder1-15/+9
2010-11-09t3404 (rebase -i): move comment to descriptionLibravatar Jonathan Nieder1-18/+17
2010-11-09t3404 (rebase -i): unroll test_commit loopsLibravatar Jonathan Nieder1-12/+11
2010-11-09t3301 (notes): use test_expect_code for clarityLibravatar Jonathan Nieder1-1/+1
2010-11-09t1400 (update-ref): use test_must_failLibravatar Jonathan Nieder1-3/+2
2010-11-09t1502 (rev-parse --parseopt): test exit code from "-h"Libravatar Jonathan Nieder1-1/+1
2010-11-09t6022 (renaming merge): chain test commands with &&Libravatar Jonathan Nieder1-190/+92
2010-11-09test-lib: introduce test_line_count to measure filesLibravatar Jonathan Nieder2-0/+26
2010-11-09tests: add missing &&, batch 2Libravatar Jonathan Nieder13-48/+48
2010-11-09tests: add missing &&Libravatar Jonathan Nieder84-166/+166
2010-11-09Merge branch 'maint'Libravatar Junio C Hamano1-3/+7
2010-11-09rebase: teach --autosquash to match on sha1 in addition to messageLibravatar Kevin Ballard1-0/+31
2010-11-09rebase: better rearranging of fixup!/squash! lines with --autosquashLibravatar Kevin Ballard1-0/+43
2010-11-08dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkoutLibravatar Nguyễn Thái Ngọc Duy1-3/+7
2010-11-05test: git-apply -p2 rename/chmod onlyLibravatar Junio C Hamano1-0/+26
2010-11-05t9001: send-email interation with --in-reply-to and --chain-reply-toLibravatar Junio C Hamano1-0/+41
2010-11-04add tests of commit --squashLibravatar Pat Notz4-0/+57
2010-11-04add tests of commit --fixupLibravatar Pat Notz3-2/+83
2010-11-03submodule: only preserve flags across recursive status/update invocationsLibravatar Kevin Ballard1-0/+34
2010-11-03submodule: preserve all arguments exactly when recursingLibravatar Kevin Ballard1-0/+16
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeLibravatar Matthieu Moy4-7/+9
2010-11-03Change remote tracking to remote-tracking in non-trivial placesLibravatar Matthieu Moy1-1/+1
2010-11-03Replace "remote tracking" with "remote-tracking"Libravatar Matthieu Moy1-1/+1