summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-feJunio C Hamano2012-01-273-174/+556
|\
| * vcs-svn: avoid hangs from corrupt deltasJonathan Nieder2011-06-151-3/+37
| * vcs-svn: implement text-delta handlingDavid Barr2011-05-261-2/+106
| * Merge branch 'db/delta-applier' into db/text-deltaJonathan Nieder2011-05-261-0/+248
| |\
| | * vcs-svn: let deltas use data from preimageJonathan Nieder2011-03-281-0/+35
| | * vcs-svn: let deltas use data from postimageJonathan Nieder2011-03-271-0/+42
| | * vcs-svn: verify that deltas consume all inline dataJonathan Nieder2011-03-271-3/+2
| | * vcs-svn: implement copyfrom_data delta instructionJonathan Nieder2011-03-271-0/+31
| | * vcs-svn: read instructions from deltasJonathan Nieder2011-03-271-0/+5
| | * vcs-svn: read inline data from deltasJonathan Nieder2011-03-271-0/+12
| | * vcs-svn: read the preimage when applying deltasJonathan Nieder2011-03-271-0/+35
| | * vcs-svn: parse svndiff0 window headerJonathan Nieder2011-03-271-1/+55
| | * vcs-svn: skeleton of an svn delta parserJonathan Nieder2011-03-271-0/+35
| * | Merge branch 'db/svn-fe-code-purge' into svn-feJonathan Nieder2011-05-261-117/+0
| |\ \
| | * | vcs-svn: drop obj_poolDavid Barr2011-03-221-79/+0
| | * | vcs-svn: drop treapDavid Barr2011-03-221-22/+0
| | * | vcs-svn: drop string_poolDavid Barr2011-03-221-16/+0
| * | | Merge branch 'db/vcs-svn-incremental' into svn-feJonathan Nieder2011-05-261-57/+170
| |\ \ \ | | |/ /
| | * | vcs-svn: quote paths correctly for ls commandDavid Barr2011-03-071-0/+99
| | * | vcs-svn: set up channel to read fast-import cat-blob responseDavid Barr2011-03-071-51/+67
| * | | Merge commit 'v1.7.5' into svn-feJonathan Nieder2011-05-0286-347/+2273
| |\ \ \
* | \ \ \ Merge branch 'nd/pathspec-recursion-cleanup'Junio C Hamano2012-01-181-0/+8
|\ \ \ \ \
| * | | | | diff-index: enable recursive pathspec matching in unpack_treesnd/pathspec-recursion-cleanupNguyen Thai Ngoc Duy2012-01-161-0/+8
* | | | | | Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano2012-01-181-0/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | word-diff: ignore '\ No newline at eof' markertr/maint-word-diff-incomplete-lineThomas Rast2012-01-121-0/+14
* | | | | | Merge branch 'ss/maint-msys-cvsexportcommit'Junio C Hamano2012-01-121-3/+3
|\ \ \ \ \ \
| * | | | | | t9200: On MSYS, do not pass Windows-style paths to CVSSebastian Schuberth2012-01-111-3/+3
* | | | | | | Merge branch 'maint'Junio C Hamano2012-01-111-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-111-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-111-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | t2203: fix wrong commit commandNguyễn Thái Ngọc Duy2012-01-111-1/+1
* | | | | | | | Merge branch 'bw/maint-t8006-sed-incomplete-line'Junio C Hamano2012-01-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use perl instead of sed for t8006-blame-textconv testbw/maint-t8006-sed-incomplete-lineBen Walton2012-01-091-1/+1
* | | | | | | | | Sync with maintJunio C Hamano2012-01-101-0/+10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-101-0/+10
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-101-0/+10
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | attr: don't confuse prefixes with leading directoriesJeff King2012-01-101-0/+10
* | | | | | | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-0/+80
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit --amend -S: strip existing gpgsig headersJunio C Hamano2012-01-051-1/+10
| * | | | | | | | | test "commit -S" and "log --show-signature"Junio C Hamano2011-11-121-0/+71
* | | | | | | | | | Merge branch 'jm/stash-diff-disambiguate'Junio C Hamano2012-01-063-28/+76
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguateJonathon Mah2012-01-013-28/+76
* | | | | | | | | | | Merge branch 'jh/fetch-head-update'Junio C Hamano2012-01-0623-27/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-updateJoey Hess2012-01-0323-27/+27
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-061-0/+290
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: rewrite view handlingPete Wyckoff2012-01-031-12/+12
| * | | | | | | | | | | git-p4: support single file p4 client view mapsGary Gibbons2012-01-031-1/+1
| * | | | | | | | | | | git-p4: sort client views by reverse View numberGary Gibbons2012-01-031-1/+1
| * | | | | | | | | | | git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2012-01-031-2/+2
| * | | | | | | | | | | git-p4: test client view handlingPete Wyckoff2012-01-031-0/+290