summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-127-0/+169
|\
| * update-index -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+32
| * merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+11
| * ls-files -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-221-0/+39
| * gc -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-221-0/+28
| * commit/status -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-221-0/+24
| * checkout-index -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-221-0/+24
| * branch -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-221-0/+11
* | t9143: do not fail when unhandled.log.gz is not createdTorsten Bögershausen2010-12-101-3/+1
* | git-svn: allow the mergeinfo property to be setSteven Walter2010-12-101-0/+41
* | Merge branch 'jk/pager-per-command'Junio C Hamano2010-12-081-0/+29
|\ \
| * | allow command-specific pagers in pager.<cmd>Jeff King2010-11-171-0/+29
* | | 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
View Lorry Controller Status