summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-051-0/+14
* Sync with 2.3.10Junio C Hamano2015-09-288-0/+248
|\
| * http: limit redirection depthBlake Burkhart2015-09-252-0/+7
| * http: limit redirection to protocol-whitelistBlake Burkhart2015-09-252-0/+10
| * submodule: allow only certain protocols for submodule fetchesJeff King2015-09-231-0/+43
| * transport: add a protocol-whitelist environment variableJeff King2015-09-236-0/+188
* | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-031-0/+21
|\ \
| * | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skipJohannes Schindelin2015-06-291-1/+1
| * | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-291-0/+21
* | | Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-031-0/+81
|\ \ \
| * | | am --abort: keep unrelated commits on unborn branchpt/am-abort-fixPaul Tan2015-06-081-0/+11
| * | | am --abort: support aborting to unborn branchPaul Tan2015-06-081-0/+17
| * | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-081-0/+23
| * | | am --skip: support skipping while on unborn branchPaul Tan2015-06-081-0/+10
| * | | am -3: support 3way merge on unborn branchPaul Tan2015-06-081-0/+9
| * | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-081-0/+11
| |/ /
* | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-031-0/+56
|\ \ \
| * | | read_loose_refs(): treat NULL_SHA1 loose references as brokenmh/reporting-broken-refs-from-for-each-refMichael Haggerty2015-06-081-1/+1
| * | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-021-1/+1
| * | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-021-0/+56
| | |/ | |/|
* | | Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-031-1/+23
|\ \ \
| * | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissorsSZEDER Gábor2015-06-091-1/+23
* | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-271-0/+6
|\ \ \ \
| * | | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruningJeff King2015-07-011-0/+6
| |/ / /
* | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano2015-07-271-52/+47
|\ \ \ \
| * | | | test-lib.sh: fix color support when tput needs ~/.terminforh/test-color-avoid-terminfo-in-original-homeRichard Hansen2015-06-171-29/+28
| * | | | Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen2015-06-171-47/+43
* | | | | Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano2015-07-151-1/+1
|\ \ \ \ \
| * | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanityPaul Tan2015-06-121-1/+1
* | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-151-0/+8
|\ \ \ \ \ \
| * | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marksJunio C Hamano2015-06-011-0/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-06-251-7/+0
|\ \ \ \ \ \
| * | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-indexJeff King2015-06-151-7/+0
* | | | | | | Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-251-8/+16
|\ \ \ \ \ \ \
| * | | | | | | setup_git_directory: delay core.bare/core.worktree errorsjk/die-on-bogus-worktree-lateJeff King2015-05-291-8/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-251-0/+15
|\ \ \ \ \ \ \
| * | | | | | | silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-011-0/+15
| |/ / / / / /
* | | | | | | Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-251-36/+53
|\ \ \ \ \ \ \
| * | | | | | | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-execJunio C Hamano2015-05-221-40/+40
| * | | | | | | rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2015-05-221-1/+1
| * | | | | | | rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy2015-05-221-0/+17
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-161-13/+36
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlockJunio C Hamano2015-05-251-13/+36
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3Junio C Hamano2015-05-251-13/+36
| | |\ \ \ \ \ \ \
| | | * | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2Jeff King2015-05-251-0/+11
| | | * | | | | | | t5551: factor out tag creationJeff King2015-05-201-13/+21
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-161-0/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contentsJim Hill2015-05-181-0/+26
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-161-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: complain about unknown flagsJeff King2015-05-201-0/+4
| | |_|_|/ / / / / | |/| | | | | | |
View Lorry Controller Status