aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ \
| * | | | | tests: skip dav http-push tests under NO_EXPAT=NoThanksJunio C Hamano2015-05-07
| * | | | | t/lib-httpd.sh: skip tests if NO_CURL is definedJeff King2015-05-07
| | |/ / / | |/| | |
* | | | | Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-05
|\ \ \ \ \
| * | | | | pull: handle --log=<n>Paul Tan2015-05-18
* | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \
| * | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-18
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \
| * | | | | | ref_transaction_commit(): fix atomicity and avoid fd exhaustionMichael Haggerty2015-05-12
| * | | | | | t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZEStefan Beller2015-05-12
| * | | | | | update-ref: test handling large transactions properlyStefan Beller2015-05-12
| |/ / / / /
* | | | | | Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \
| * | | | | | ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-11
| * | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-11
| * | | | | | refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-11
| * | | | | | t1404: new tests of ref D/F conflicts within transactionsMichael Haggerty2015-05-11
| |/ / / / /
* | | | | | Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \
| * | | | | | log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2015-05-13
* | | | | | | Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | subdirectory tests: code cleanup, uncomment testStefan Beller2015-05-18
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \
| * | | | | | | ignore: info/exclude should trump core.excludesfileJunio C Hamano2015-04-22
* | | | | | | | Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \
| * | | | | | | | connect: improve check for plink to reduce false positivesbrian m. carlson2015-04-28
| * | | | | | | | t5601: fix quotation error leading to skipped testsbrian m. carlson2015-04-28
* | | | | | | | | Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i: redo tasks that die during cherry-pickPhil Hord2015-04-29
* | | | | | | | | | Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: check return value of launch_editorJeff King2015-05-12
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame: CRLF in the working tree and LF in the repoTorsten Bögershausen2015-05-03
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0302: "unreadable" test needs POSIXPERMJunio C Hamano2015-03-25
| * | | | | | | | | | t0302: test credential-store support for XDG_CONFIG_HOMEPaul Tan2015-03-24
* | | | | | | | | | | Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t1007: add hash-object --literally testsEric Sunshine2015-05-05
* | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | filter-branch: avoid passing commit message through sedJeff King2015-04-29
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stash: require a clean index to applyJeff King2015-04-22
| * | | | | | | | | | | | t3903: avoid applying onto dirty indexJeff King2015-04-22