summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-057-35/+12
|\ \ \ \ \ \ \
| * | | | | | | tests: skip dav http-push tests under NO_EXPAT=NoThanksjk/skip-http-tests-under-no-curlJunio C Hamano2015-05-071-0/+6
| * | | | | | | t/lib-httpd.sh: skip tests if NO_CURL is definedJeff King2015-05-077-35/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-051-0/+17
|\ \ \ \ \ \ \
| * | | | | | | pull: handle --log=<n>pt/pull-log-nPaul Tan2015-05-181-0/+17
* | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-051-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-0/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-052-2/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-121-2/+2
| * | | | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-121-2/+2
| * | | | | | | | update-ref: test handling large transactions properlyStefan Beller2015-05-121-0/+28
| |/ / / / / / /
* | | | | | | | Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-052-7/+114
|\ \ \ \ \ \ \ \
| * | | | | | | | ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-111-7/+7
| * | | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-111-4/+4
| * | | | | | | | refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-111-1/+1
| * | | | | | | | t1404: new tests of ref D/F conflicts within transactionsMichael Haggerty2015-05-111-0/+107
| |/ / / / / / /
* | | | | | | | Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2015-05-131-1/+1
* | | | | | | | | Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-051-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | subdirectory tests: code cleanup, uncomment testsb/t1020-cleanupStefan Beller2015-05-181-4/+7
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-051-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ignore: info/exclude should trump core.excludesfilejc/gitignore-precedenceJunio C Hamano2015-04-221-0/+10
* | | | | | | | | | Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-051-1/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | connect: improve check for plink to reduce false positivesbc/connect-plinkbrian m. carlson2015-04-281-0/+33
| * | | | | | | | | | t5601: fix quotation error leading to skipped testsbrian m. carlson2015-04-281-1/+1
* | | | | | | | | | | Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-051-0/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase -i: redo tasks that die during cherry-pickph/rebase-i-redoPhil Hord2015-04-291-0/+47
View Lorry Controller Status