summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2013-01-081-2/+4
|\
| * t1402: work around shell quoting issue on NetBSDRené Scharfe2013-01-081-2/+4
| * Merge branch 'jc/test-portability' into maintJunio C Hamano2013-01-082-6/+10
| |\
| * \ Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maintJunio C Hamano2013-01-081-1/+2
| |\ \
| * \ \ Merge branch 'jc/maint-test-portability' into maintJunio C Hamano2013-01-083-6/+8
| |\ \ \
* | \ \ \ Merge branch 'as/test-name-alias-uniquely'Junio C Hamano2013-01-081-6/+6
|\ \ \ \ \
| * | | | | Use longer alias names in subdirectory testsAaron Schrab2012-12-281-6/+6
* | | | | | Merge branch 'tb/test-t9810-no-sed-i'Junio C Hamano2013-01-081-10/+14
|\ \ \ \ \ \
| * | | | | | t9810: Do not use sed -iTorsten Bögershausen2013-01-011-10/+14
| |/ / / / /
* | | | | | Merge branch 'tb/test-t9020-no-which'Junio C Hamano2013-01-081-2/+2
|\ \ \ \ \ \
| * | | | | | t9020: which is not portableTorsten Bögershausen2013-01-011-2/+2
* | | | | | | Merge branch 'jk/pathspec-literal'Junio C Hamano2013-01-081-1/+7
|\ \ \ \ \ \ \
| * | | | | | | t6130-pathspec-noglob: Windows does not allow a file named "f*"Johannes Sixt2013-01-061-1/+7
* | | | | | | | Merge branch 'wk/submodule-update-remote'Junio C Hamano2013-01-052-0/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule add: If --branch is given, record it in .gitmodulesW. Trevor King2012-12-191-0/+1
| * | | | | | | | submodule update: add --remote for submodule's upstream changesW. Trevor King2012-12-191-0/+31
* | | | | | | | | Merge branch 'jk/pathspec-literal'Junio C Hamano2013-01-051-0/+62
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | add global --literal-pathspecs optionJeff King2012-12-191-0/+62
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/format-color-auto'Junio C Hamano2013-01-051-4/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | log --format: teach %C(auto,black) to respect color configJunio C Hamano2012-12-171-0/+55
| * | | | | | | | t6006: clean up whitespaceJunio C Hamano2012-12-171-4/+4
* | | | | | | | | Merge branch 'ja/directory-attrs'Junio C Hamano2013-01-051-0/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add directory pattern matching to attributesJean-Noël AVILA2012-12-171-0/+57
* | | | | | | | | | Merge branch 'jk/mailmap-from-blob'Junio C Hamano2013-01-051-0/+98
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mailmap: default mailmap.blob in bare repositoriesJeff King2012-12-131-0/+25
| * | | | | | | | | | mailmap: support reading mailmap from blobsJeff King2012-12-121-0/+73
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/fetch-ignore-symref'Junio C Hamano2013-01-051-0/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch: ignore wildcarded refspecs that update local symbolic refsJunio C Hamano2012-12-111-0/+42
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-051-1/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | push: require force for annotated tagsChris Rorvick2012-12-021-0/+21
| * | | | | | | | | | push: require force for refs under refs/tags/Chris Rorvick2012-12-021-1/+22
* | | | | | | | | | | Merge branch 'fc/fast-export-fixes'Junio C Hamano2013-01-053-10/+238
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fast-export: make sure updated refs get updatedFelipe Contreras2012-12-032-12/+23
| * | | | | | | | | | | fast-export: don't handle uninteresting refsFelipe Contreras2012-12-032-0/+38
| * | | | | | | | | | | fast-export: fix comparison in testsFelipe Contreras2012-11-291-3/+3
| * | | | | | | | | | | remote-testgit: exercise more featuresFelipe Contreras2012-11-291-0/+52
| * | | | | | | | | | | remote-testgit: cleanup testsFelipe Contreras2012-11-291-34/+29
| * | | | | | | | | | | remote-testgit: remove irrelevant testFelipe Contreras2012-11-291-13/+0
| * | | | | | | | | | | remote-testgit: remove non-local functionalityFelipe Contreras2012-11-291-29/+21
| * | | | | | | | | | | Add new simplified git-remote-testgitFelipe Contreras2012-11-291-0/+139
| * | | | | | | | | | | Rename git-remote-testgit to git-remote-testpyFelipe Contreras2012-11-291-7/+7
| * | | | | | | | | | | remote-helpers: fix failure messageFelipe Contreras2012-11-261-2/+2
| * | | | | | | | | | | fast-export: avoid importing blob marksFelipe Contreras2012-11-261-0/+14
* | | | | | | | | | | | Merge branch 'jk/fsck-dot-in-trees'Junio C Hamano2013-01-051-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fsck: warn about ".git" in treesJeff King2012-11-281-0/+15
| * | | | | | | | | | | | fsck: warn about '.' and '..' in treesJeff King2012-11-281-0/+16
* | | | | | | | | | | | | Merge branch 'as/test-tweaks'Junio C Hamano2013-01-032-59/+184
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: paint unexpectedly fixed known breakages in bold redAdam Spiers2012-12-202-10/+33
| * | | | | | | | | | | | | tests: test the test framework more thoroughlyAdam Spiers2012-12-201-0/+105
| * | | | | | | | | | | | | tests: refactor mechanics of testing in a sub test-libAdam Spiers2012-12-201-45/+40