summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-282-3/+32
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jh/fast-import-notes' into maintJunio C Hamano2011-12-281-5/+58
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-282-4/+21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-212-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-upload-archive' into maintJunio C Hamano2011-12-211-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-222-26/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t3502, t3510: clarify cherry-pick -m failurerr/revert-cherry-pickRamkumar Ramachandra2011-12-152-2/+2
| * | | | | | | | | | | | | | | t3510 (cherry-pick-sequencer): use exit statusRamkumar Ramachandra2011-12-151-29/+29
| * | | | | | | | | | | | | | | revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-151-0/+11
| * | | | | | | | | | | | | | | revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-151-0/+28
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'tr/pty-all'Junio C Hamano2011-12-221-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test-terminal: set output terminals to raw modetr/pty-allThomas Rast2011-12-191-0/+4
View Lorry Controller Status