summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-log-first-parent-pathspec'Junio C Hamano2012-01-291-0/+1
|\
| * Making pathspec limited log play nicer with --first-parentjc/maint-log-first-parent-pathspecJunio C Hamano2012-01-191-0/+1
* | Merge branch 'jl/test-pause'Junio C Hamano2012-01-292-0/+26
|\ \
| * | test-lib: add the test_pause convenience functionjl/test-pauseJens Lehmann2012-01-172-0/+26
* | | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-291-2/+12
|\ \ \
| * | | mailinfo: with -b, keep space after [foo]tr/maint-mailinfoThomas Rast2012-01-161-1/+1
| * | | am: learn passing -b to mailinfoThomas Rast2012-01-161-2/+12
* | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-292-3/+396
|\ \ \ \
| * | | | git-p4: add tests demonstrating spec overlay ambiguitiespw/p4-view-updatesPete Wyckoff2012-01-111-0/+387
| * | | | git-p4: adjust test to adhere to stricter useClientSpecPete Wyckoff2012-01-111-2/+2
| * | | | git-p4: only a single ... wildcard is supportedPete Wyckoff2012-01-111-1/+7
* | | | | Merge branch 'jn/gitweb-unspecified-action'Junio C Hamano2012-01-291-0/+8
|\ \ \ \ \
| * | | | | gitweb: Fix actionless dispatch for non-existent objectsjn/gitweb-unspecified-actionJakub Narebski2012-01-091-0/+8
* | | | | | Merge branch 'cb/push-quiet'Junio C Hamano2012-01-292-0/+15
|\ \ \ \ \ \
| * | | | | | t5541: avoid TAP test miscountingcb/push-quietMichael J Gruber2012-01-081-1/+1
| * | | | | | fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher2012-01-082-0/+15
* | | | | | | Merge branch 'nd/clone-single-branch'Junio C Hamano2012-01-291-1/+71
|\ \ \ \ \ \ \
| * | | | | | | clone: add --single-branch to fetch only one branchnd/clone-single-branchNguyễn Thái Ngọc Duy2012-01-081-1/+71
* | | | | | | | Merge branch 'cb/git-daemon-tests'Junio C Hamano2012-01-292-0/+217
|\ \ \ \ \ \ \ \
| * | | | | | | | git-daemon tests: wait until daemon is readycb/git-daemon-testsClemens Buchacher2012-01-081-1/+17
| * | | | | | | | git-daemon: add testsClemens Buchacher2012-01-082-0/+201
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
View Lorry Controller Status