summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | 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
* | | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-051-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add: check return value of launch_editorjk/add-e-kill-editorJeff King2015-05-121-0/+7
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-051-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-gitTorsten Bögershausen2015-05-031-3/+15
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-051-0/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | t0302: "unreadable" test needs POSIXPERMpt/credential-xdgJunio C Hamano2015-03-251-1/+1
| * | | | | | | | | | | | t0302: test credential-store support for XDG_CONFIG_HOMEPaul Tan2015-03-241-0/+114
* | | | | | | | | | | | | Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-261-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1007: add hash-object --literally testsEric Sunshine2015-05-051-0/+11
* | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-261-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | filter-branch: avoid passing commit message through sedJeff King2015-04-291-0/+10
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-261-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | stash: require a clean index to applyJeff King2015-04-221-0/+7
| * | | | | | | | | | | | | t3903: avoid applying onto dirty indexJeff King2015-04-221-2/+2
| * | | | | | | | | | | | | t3903: stop hard-coding commit sha1sJeff King2015-04-221-5/+5
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/t1509-chroot-test' into maintJunio C Hamano2015-05-131-9/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1509: update prepare script to be able to run t1509 in chroot againnd/t1509-chroot-testNguyễn Thái Ngọc Duy2015-04-181-9/+29
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/type-from-string-gently' into maintJunio C Hamano2015-05-131-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | type_from_string_gently: make sure length matchesjk/type-from-string-gentlyJeff King2015-04-171-0/+8
* | | | | | | | | | | | | | Merge branch 'ep/fix-test-lib-functions-report' into maintJunio C Hamano2015-05-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | test-lib-functions.sh: fix the second argument to some helper functionsep/fix-test-lib-functions-reportElia Pinto2015-04-161-2/+2