summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-0/+12
* 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 '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
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-041-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | t5550: repack everything into one fileClemens Buchacher2012-01-041-2/+1
* | | | | | | Merge branch 'pw/p4-docs-and-tests'Junio C Hamano2012-01-037-38/+322
|\ \ \ \ \ \ \
| * | | | | | | git-p4: document and test submit optionspw/p4-docs-and-testsPete Wyckoff2011-12-271-0/+54
| * | | | | | | git-p4: test and document --use-client-specPete Wyckoff2011-12-271-0/+46
| * | | | | | | git-p4: test --keep-pathPete Wyckoff2011-12-271-0/+24
| * | | | | | | git-p4: test --max-changesPete Wyckoff2011-12-271-0/+10
| * | | | | | | git-p4: document and test --import-localPete Wyckoff2011-12-271-0/+22
| * | | | | | | git-p4: honor --changesfile option and testPete Wyckoff2011-12-271-0/+23
| * | | | | | | git-p4: document and test clone --branchPete Wyckoff2011-12-271-0/+11
| * | | | | | | git-p4: test cloning with two dirs, clarify docPete Wyckoff2011-12-271-0/+60
| * | | | | | | git-p4: clone does not use --git-dirPete Wyckoff2011-12-271-0/+34
| * | | | | | | rename git-p4 testsPete Wyckoff2011-12-275-0/+0
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-031-0/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | fix hang in git fetch if pointed at a 0 length bundleBrian Harring2012-01-031-0/+6
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2011-12-281-0/+49
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/http-push-to-empty' into maintJunio C Hamano2011-12-281-0/+32
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-282-58/+156
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-push-over-dav' into maintJunio C Hamano2011-12-282-0/+37
| |\ \ \ \ \ \ \ \
View Lorry Controller Status