aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'jn/git-cmd-h-bypass-setup'Junio C Hamano2010-12-12
|\
| * update-index -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-22
| * merge -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-22
| * ls-files -h: show usage even with corrupt indexNguyễn Thái Ngọc Duy2010-10-22
| * gc -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-22
| * commit/status -h: show usage even with broken configurationNguyễn Thái Ngọc Duy2010-10-22
| * checkout-index -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-22
| * branch -h: show usage even in an invalid repositoryNguyễn Thái Ngọc Duy2010-10-22
* | t9143: do not fail when unhandled.log.gz is not createdTorsten Bögershausen2010-12-10
* | git-svn: allow the mergeinfo property to be setSteven Walter2010-12-10
* | Merge branch 'jk/pager-per-command'Junio C Hamano2010-12-08
|\ \
| * | allow command-specific pagers in pager.<cmd>Jeff King2010-11-17
* | | Merge branch 'jk/maint-decorate-01-bool'Junio C Hamano2010-12-08
|\ \ \ | |/ /
| * | log.decorate: accept 0/1 bool valuesJeff King2010-11-17
* | | Merge branch 'gc/http-with-non-ascii-username-url'Junio C Hamano2010-12-08
|\ \ \
| * | | Fix username and password extraction from HTTP URLsGabriel Corona2010-11-17
| * | | t5550: test HTTP authentication and userinfo decodingGabriel Corona2010-11-17
| |/ /
* | | Merge branch 'mg/maint-tag-rfc1991'Junio C Hamano2010-12-08
|\ \ \
| * | | tag: recognize rfc1991 signaturesMichael J Gruber2010-11-10
| * | | t/t7004-tag: test handling of rfc1991 signaturesMichael J Gruber2010-11-10
* | | | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-08
|\ \ \ \
| * | | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-17
| * | | | Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-17
| * | | | git notes merge: Add testcases for merging notes trees at different fanoutsJohan Herland2010-11-17
| * | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
| * | | | git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-17
| * | | | git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-17
| * | | | git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
| * | | | git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
| * | | | git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-17
| * | | | git notes merge: Handle real, non-conflicting notes mergesJohan Herland2010-11-17
| * | | | git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17
| * | | | notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-17
| * | | | (trivial) t3303: Indent with tabs instead of spaces for consistencyJohan Herland2010-11-17
* | | | | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-03
|\ \ \ \ \
| * | | | | add tests of commit --squashPat Notz2010-11-04
| * | | | | add tests of commit --fixupPat Notz2010-11-04
* | | | | | Merge branch 'cb/leading-path-removal'Junio C Hamano2010-11-29
|\ \ \ \ \ \
| * | | | | | use persistent memory for rejected pathsClemens Buchacher2010-11-15
| * | | | | | do not overwrite files in leading pathClemens Buchacher2010-10-13
| * | | | | | t7607: add leading-path testsClemens Buchacher2010-10-13
| * | | | | | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-10-13
| |/ / / / /
* | | | | | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-29
|\ \ \ \ \ \
| * | | | | | t6022: Use -eq not = to test output of wc -lBrian Gernhardt2010-11-17
| * | | | | | merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-29
| * | | | | | handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * | | | | | merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * | | | | | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-29
| * | | | | | conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * | | | | | merge-recursive: Delay content merging for renamesElijah Newren2010-09-29