summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-decorate-01-bool'Junio C Hamano2010-12-081-0/+9
|\
| * log.decorate: accept 0/1 bool valuesJeff King2010-11-171-0/+9
* | Merge branch 'gc/http-with-non-ascii-username-url'Junio C Hamano2010-12-084-0/+40
|\ \
| * | Fix username and password extraction from HTTP URLsGabriel Corona2010-11-171-1/+1
| * | t5550: test HTTP authentication and userinfo decodingGabriel Corona2010-11-174-0/+40
| |/
* | Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano2010-12-081-0/+66
|\ \
| * | tag: recognize rfc1991 signaturesMichael J Gruber2010-11-101-6/+6
| * | t/t7004-tag: test handling of rfc1991 signaturesMichael J Gruber2010-11-101-0/+66
* | | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-089-9/+2359
|\ \ \
| * | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-0/+313
| * | | Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-171-0/+19
| * | | git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland2010-11-171-0/+436
| * | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-0/+145
| * | | git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-171-0/+76
| * | | git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-0/+12
| * | | git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-0/+176
| * | | git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-0/+292
| * | | git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-0/+502
| * | | git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-171-0/+188
| * | | git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-171-0/+180
| * | | notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-174-0/+11
| * | | (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland2010-11-171-9/+9
* | | | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-034-2/+140
|\ \ \ \
| * | | | add tests of commit --squashPat Notz2010-11-044-0/+57
| * | | | add tests of commit --fixupPat Notz2010-11-043-2/+83
* | | | | Merge branch 'cb/leading-path-removal'Junio C Hamano2010-11-292-31/+87
|\ \ \ \ \
| * | | | | use persistent memory for rejected pathsClemens Buchacher2010-11-152-11/+24
| * | | | | do not overwrite files in leading pathClemens Buchacher2010-10-131-1/+1
| * | | | | t7607: add leading-path testsClemens Buchacher2010-10-131-0/+51
| * | | | | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-10-131-23/+15
| |/ / / /
* | | | | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-296-17/+743
|\ \ \ \ \
| * | | | | t6022: Use -eq not = to test output of wc -lBrian Gernhardt2010-11-171-32/+32
| * | | | | merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-291-1/+1
| * | | | | handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-1/+1
| * | | | | merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-4/+4
| * | | | | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-291-1/+1
| * | | | | conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-2/+2
| * | | | | merge-recursive: Delay content merging for renamesElijah Newren2010-09-291-1/+1
| * | | | | merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-291-1/+1
| * | | | | merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-291-2/+2
| * | | | | t6036: Add testcase for undetected conflictElijah Newren2010-09-291-0/+85
| * | | | | t6036: Add a second testcase similar to the first but with content changesElijah Newren2010-09-291-0/+76
| * | | | | t6036: Test index and worktree state, not just that merge failsElijah Newren2010-09-291-3/+21
| * | | | | t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren2010-09-291-0/+47
| * | | | | t6020: Modernize style a bitElijah Newren2010-09-291-15/+20
| * | | | | t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren2010-09-291-0/+79
| * | | | | t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren2010-09-291-0/+63
| * | | | | t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren2010-09-291-0/+38
| * | | | | t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren2010-09-291-0/+58
| * | | | | t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren2010-09-291-0/+128
View Lorry Controller Status