aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Sync with 2.3.10Junio C Hamano2015-09-28
|\
| * http: limit redirection depthBlake Burkhart2015-09-25
| * http: limit redirection to protocol-whitelistBlake Burkhart2015-09-25
| * submodule: allow only certain protocols for submodule fetchesJeff King2015-09-23
| * transport: add a protocol-whitelist environment variableJeff King2015-09-23
* | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-03
|\ \
| * | rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2015-06-29
| * | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-29
* | | Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-03
|\ \ \
| * | | am --abort: keep unrelated commits on unborn branchPaul Tan2015-06-08
| * | | am --abort: support aborting to unborn branchPaul Tan2015-06-08
| * | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-08
| * | | am --skip: support skipping while on unborn branchPaul Tan2015-06-08
| * | | am -3: support 3way merge on unborn branchPaul Tan2015-06-08
| * | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-08
| |/ /
* | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-03
|\ \ \
| * | | read_loose_refs(): treat NULL_SHA1 loose references as brokenMichael Haggerty2015-06-08
| * | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-02
| * | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-02
| | |/ | |/|
* | | Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-03
|\ \ \
| * | | commit: cope with scissors lines in commit messageSZEDER Gábor2015-06-09
* | | | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-27
|\ \ \ \
| * | | | rev-list: disable --use-bitmap-index when pruning commitsJeff King2015-07-01
| |/ / /
* | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano2015-07-27
|\ \ \ \
| * | | | test-lib.sh: fix color support when tput needs ~/.terminfoRichard Hansen2015-06-17
| * | | | Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen2015-06-17
* | | | | Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano2015-07-15
|\ \ \ \ \
| * | | | | t0302: "unreadable" test needs SANITY prereqPaul Tan2015-06-12
* | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-15
|\ \ \ \ \ \
| * | | | | | format-patch: do not feed tags to clear_commit_marks()Junio C Hamano2015-06-01
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-06-25
|\ \ \ \ \ \
| * | | | | | Revert "stash: require a clean index to apply"Jeff King2015-06-15
* | | | | | | Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-25
|\ \ \ \ \ \ \
| * | | | | | | setup_git_directory: delay core.bare/core.worktree errorsJeff King2015-05-29
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-25
|\ \ \ \ \ \ \
| * | | | | | | silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-01
| |/ / / / / /
* | | | | | | Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-25
|\ \ \ \ \ \ \
| * | | | | | | t5407: use <<- to align the expected outputJunio C Hamano2015-05-22
| * | | | | | | rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2015-05-22
| * | | | | | | rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy2015-05-22
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-16
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockJunio C Hamano2015-05-25
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3Junio C Hamano2015-05-25
| | |\ \ \ \ \ \ \
| | | * | | | | | | http-backend: spool ref negotiation requests to bufferJeff King2015-05-25
| | | * | | | | | | t5551: factor out tag creationJeff King2015-05-20
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_file: pass empty buffer to index empty fileJim Hill2015-05-18
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: complain about unknown flagsJeff King2015-05-20
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \