summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/test-lint-scripts'Junio C Hamano2014-07-161-2/+3
|\
| * t/Makefile: always test all lint targets when running testsjl/test-lint-scriptsJens Lehmann2014-07-101-1/+1
| * t/Makefile: check helper scripts for non-portable shell commands tooJens Lehmann2014-07-101-1/+2
* | Merge branch 'zk/log-graph-showsig'Junio C Hamano2014-07-161-0/+31
|\ \
| * | log: fix indentation for --graph --show-signaturezk/log-graph-showsigZoltan Klinger2014-07-091-0/+31
* | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges'Junio C Hamano2014-07-161-0/+11
|\ \ \
| * | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-mergesCharles Bailey2014-07-011-0/+11
* | | | Merge branch 'mk/merge-incomplete-files'Junio C Hamano2014-07-161-3/+88
|\ \ \ \
| * | | | git-merge-file: do not add LF at EOF while applying unrelated changemk/merge-incomplete-filesMax Kirillov2014-06-301-0/+85
| * | | | t6023-merge-file.sh: fix and mark as broken invalid testsMax Kirillov2014-06-301-3/+3
* | | | | Merge branch 'tb/crlf-tests'Junio C Hamano2014-07-162-61/+326
|\ \ \ \ \
| * | | | | t0027: combinations of core.autocrlf, core.eol and textTorsten Bögershausen2014-07-081-0/+265
| * | | | | t0025: rename the test filesTorsten Bögershausen2014-07-081-61/+61
| |/ / / /
* | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-162-0/+196
|\ \ \ \ \
| * | | | | t1700: new tests for split-index modeNguyễn Thái Ngọc Duy2014-06-131-0/+194
| * | | | | t2104: make sure split index mode is off for the version testNguyễn Thái Ngọc Duy2014-06-131-0/+2
* | | | | | Merge branch 'dt/refs-check-refname-component-sse-fix'Junio C Hamano2014-07-101-4/+11
|\ \ \ \ \ \
| * | | | | | refs: fix valgrind suppression filedt/refs-check-refname-component-sse-fixDavid Turner2014-07-081-4/+11
* | | | | | | Merge branch 'rs/simplify-archive-tests'Junio C Hamano2014-07-102-16/+8
|\ \ \ \ \ \ \
| * | | | | | | t5000, t5003: simplify commitrs/simplify-archive-testsRené Scharfe2014-07-072-16/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'mg/verify-commit'Junio C Hamano2014-07-101-1/+19
|\ \ \ \ \ \ \
| * | | | | | | t7510: test verify-commitMichael J Gruber2014-06-231-1/+19
| * | | | | | | t7510: exit for loop with test resultMichael J Gruber2014-06-231-2/+2
* | | | | | | | Merge branch 'jk/pretty-G-format-fixes'Junio C Hamano2014-07-092-9/+68
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | move "%G" format test from t7510 to t6006jk/pretty-G-format-fixesJeff King2014-06-252-6/+6
| * | | | | | | pretty: avoid reading past end-of-string with "%G"Jeff King2014-06-171-0/+6
| * | | | | | | t7510: check %G* pretty-format outputJeff King2014-06-171-0/+40
| * | | | | | | t7510: test a commit signed by an unknown keyJeff King2014-06-171-0/+13
| * | | | | | | t7510: use consistent &&-chains in loopMichael J Gruber2014-06-171-6/+6
| * | | | | | | t7510: stop referring to master in later testsJeff King2014-06-171-3/+3
* | | | | | | | Merge branch 'dt/refs-check-refname-component-sse'Junio C Hamano2014-07-022-0/+23
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | refs.c: SSE2 optimizations for check_refname_componentdt/refs-check-refname-component-sseDavid Turner2014-06-182-0/+23
* | | | | | | | Merge branch 'ye/http-extract-charset'Junio C Hamano2014-07-022-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | http: fix charset detection of extract_content_type()ye/http-extract-charsetYi EungJun2014-06-172-0/+9
* | | | | | | | | Merge branch 'bc/fix-rebase-merge-skip'Junio C Hamano2014-07-021-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skipbrian m. carlson2014-06-161-0/+15
| * | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-281-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-282-0/+38
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2014-07-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
| * | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-252-59/+100
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+72
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-253-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-251-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-251-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-251-0/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2014-06-251-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-251-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-251-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \