summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/status-show-in-progress'Junio C Hamano2013-02-141-35/+52
|\
| * status: show the branch name if possible in in-progress infoNguyễn Thái Ngọc Duy2013-02-051-35/+52
* | Merge branch 'sp/smart-http-content-type-check'Junio C Hamano2013-02-104-0/+21
|\ \
| * | t5551: fix expected error outputJunio C Hamano2013-02-041-2/+1
| * | Verify Content-Type from smart HTTP serversShawn Pearce2013-02-044-0/+22
| * | Merge branch 'tb/t0050-maint' into maintJunio C Hamano2013-01-301-35/+17
| |\ \
| * \ \ Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano2013-01-281-0/+146
| |\ \ \
| * \ \ \ Merge branch 'mh/ceiling' into maintJunio C Hamano2013-01-282-58/+13
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/combine-diff-many-parents'Junio C Hamano2013-02-081-0/+24
|\ \ \ \ \ \
| * | | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-051-0/+24
* | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-072-2/+37
|\ \ \ \ \ \ \
| * | | | | | | branch: let branch filters imply --listJeff King2013-01-311-0/+35
| * | | | | | | branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2013-01-301-2/+2
* | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-051-2/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-311-2/+28
* | | | | | | | | Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano2013-02-049-66/+252
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git p4 test: use test_chmod for cygwinPete Wyckoff2013-01-261-4/+7
| * | | | | | | | | git p4: cygwin p4 client does not mark read-onlyPete Wyckoff2013-01-263-4/+27
| * | | | | | | | | git p4 test: avoid wildcard * in windowsPete Wyckoff2013-01-262-10/+37
| * | | | | | | | | git p4 test: use LineEnd unix in windows tests tooPete Wyckoff2013-01-261-0/+1
| * | | | | | | | | git p4 test: newline handlingPete Wyckoff2013-01-261-0/+117
| * | | | | | | | | git p4 test: translate windows paths for cygwinPete Wyckoff2013-01-263-3/+26
| * | | | | | | | | git p4 test: start p4d inside its db dirPete Wyckoff2013-01-261-2/+5
| * | | | | | | | | git p4 test: use client_view in t9806Pete Wyckoff2013-01-262-30/+23
| * | | | | | | | | git p4 test: avoid loop in client_viewPete Wyckoff2013-01-262-4/+2
| * | | | | | | | | git p4 test: use client_view to build the initial clientPete Wyckoff2013-01-261-9/+2
| * | | | | | | | | git p4: generate better error message for bad depot pathPete Wyckoff2013-01-261-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-041-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | logmsg_reencode: lazily load missing commit buffersJeff King2013-01-261-0/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-041-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | archive-tar: use parse_config_key when parsing configJeff King2013-01-231-1/+2
* | | | | | | | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-043-0/+92
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Allow custom "comment char"Junio C Hamano2013-01-163-0/+92
* | | | | | | | | | Merge branch 'bc/git-p4-for-python-2.4'Junio C Hamano2013-02-011-5/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4.py: support Python 2.4Brandon Casey2013-01-261-5/+6
* | | | | | | | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests'Junio C Hamano2013-02-011-1/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t9902: protect test from stray build artifactsJunio C Hamano2013-01-241-1/+24
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'as/test-cleanup'Junio C Hamano2013-02-011-20/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-01-241-20/+21
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'rs/zip-tests' into maintJunio C Hamano2013-01-205-80/+140
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fetch-depth-is-broken'Junio C Hamano2013-02-011-6/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | upload-pack: fix off-by-one depth calculation in shallow cloneNguyễn Thái Ngọc Duy2013-01-111-6/+19
| * | | | | | | | | | | | fetch: add --unshallow for turning shallow repo into complete oneNguyễn Thái Ngọc Duy2013-01-111-0/+20
* | | | | | | | | | | | | Merge branch 'nd/magic-pathspec-from-root'Junio C Hamano2013-01-301-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update :/abc ambiguity checkNguyễn Thái Ngọc Duy2013-01-211-2/+15
* | | | | | | | | | | | | | Merge branch 'tb/t0050-maint'Junio C Hamano2013-01-281-35/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | t0050: Use TAB for indentationTorsten Bögershausen2013-01-211-33/+15
| * | | | | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case)Torsten Bögershausen2013-01-211-1/+1
| * | | | | | | | | | | | t0050: known breakage vanished in merge (case change)Torsten Bögershausen2013-01-211-1/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano2013-01-251-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status