summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-commit-ignore-i-t-a'Junio C Hamano2012-02-121-3/+5
|\
| * commit: ignore intent-to-add entries instead of refusingjc/maint-commit-ignore-i-t-aJunio C Hamano2012-02-071-3/+5
* | Merge branch 'jk/maint-tag-show-fixes'Junio C Hamano2012-02-121-0/+13
|\ \
| * | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-081-0/+13
| |/
* | Merge branch 'jn/merge-no-edit-fix'Junio C Hamano2012-02-121-0/+12
|\ \
| * | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-0/+12
* | | Merge branch 'jc/parse-date-raw'Junio C Hamano2012-02-101-0/+23
|\ \ \
| * | | parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-031-0/+23
* | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-101-0/+13
|\ \ \ \ | | |/ / | |/| |
| * | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-0/+13
* | | | Merge branch 'jc/branch-desc-typoavoidance'Junio C Hamano2012-02-101-4/+37
|\ \ \ \
| * | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-4/+37
* | | | | Merge branch 'jk/tests-write-script'Junio C Hamano2012-02-102-6/+11
|\ \ \ \ \
| * | | | | t0300: use write_script helperjk/tests-write-scriptJeff King2012-02-031-6/+2
| |/ / / /
| * | | | tests: add write_script helper functionJunio C Hamano2012-02-031-0/+9
| |/ / /
* | | | Merge branch 'jc/maint-request-pull-for-tag'Junio C Hamano2012-02-071-5/+1
|\ \ \ \
| * | | | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tagJunio C Hamano2012-01-311-5/+1
* | | | | Merge branch 'jn/svn-fe'Junio C Hamano2012-02-073-174/+556
|\ \ \ \ \
| * \ \ \ \ 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 'jc/pull-signed-tag'Junio C Hamano2012-01-311-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-1/+2
* | | | | | | | | | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-313-17/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: allow --branch to take a tagNguyễn Thái Ngọc Duy2012-01-162-0/+24
| * | | | | | | | | | clone: refuse to clone if --branch points to bogus refNguyễn Thái Ngọc Duy2012-01-162-13/+2
| * | | | | | | | | | clone: write detached HEAD in bare repositoriesNguyễn Thái Ngọc Duy2012-01-161-1/+24
| * | | | | | | | | | t5601: add missing && cascadeNguyễn Thái Ngọc Duy2012-01-161-3/+3
* | | | | | | | | | | Merge branch 'da/maint-mergetool-twoway'Junio C Hamano2012-01-311-1/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-231-1/+27
* | | | | | | | | | | | Merge branch 'va/git-p4-branch'Junio C Hamano2012-01-311-7/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9801: do not overuse test_must_failva/git-p4-branchJunio C Hamano2012-01-261-4/+4