summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* push: teach --recurse-submodules the on-demand optionHeiko Voigt2012-03-301-0/+94
* Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt2012-03-301-0/+33
* Sync with maintJunio C Hamano2012-02-139-143/+11
|\
| * Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-131-0/+23
| |\
| * \ Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-131-0/+13
| |\ \
| * \ \ Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-132-4/+46
| |\ \ \
| * | | | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-136-10/+10
| * | | | Remove Git's support for smoke testingÆvar Arnfjörð Bjarmason2012-02-133-133/+1
| * | | | Merge branch 'jc/maint-request-pull-for-tag' into maintJunio C Hamano2012-02-101-5/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-101-0/+22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jl/submodule-re-add' into maintJunio C Hamano2012-02-101-0/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'da/maint-mergetool-twoway' into maintJunio C Hamano2012-02-101-1/+27
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2012-02-051-0/+28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-log-first-parent-pathspec' into maintJunio C Hamano2012-02-051-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-052-0/+15
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-out-of-unborn'Junio C Hamano2012-02-121-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-061-1/+10
* | | | | | | | | | | | | Merge branch 'nd/diffstat-gramnum'Junio C Hamano2012-02-1264-109/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-0364-109/+109
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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