summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'jk/skip-http-tests-under-no-curl'Junio C Hamano2015-05-227-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 'kn/cat-file-literally'Junio C Hamano2015-05-191-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t1006: add tests for git cat-file --allow-unknown-typekn/cat-file-literallyKarthik Nayak2015-05-061-0/+45
* | | | | | | | | | | | | Merge branch 'jc/merge'Junio C Hamano2015-05-196-22/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/mergeJunio C Hamano2015-04-294-6/+6
| * | | | | | | | | | | | | merge: handle FETCH_HEAD internallyJunio C Hamano2015-04-291-5/+5
| * | | | | | | | | | | | | t5520: test pulling an octopus into an unborn branchJunio C Hamano2015-04-291-0/+9
| * | | | | | | | | | | | | t5520: style fixesJunio C Hamano2015-04-291-16/+6
| * | | | | | | | | | | | | merge: test the top-level merge driverJunio C Hamano2015-04-291-0/+136
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ph/rebase-i-redo'Junio C Hamano2015-05-191-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase -i: redo tasks that die during cherry-pickph/rebase-i-redoPhil Hord2015-04-291-0/+47
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-272-16/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-215-15/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/test-prereq-validate'Junio C Hamano2015-05-191-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | test: validate prerequistes syntaxjc/test-prereq-validateJunio C Hamano2015-04-281-0/+9
* | | | | | | | | | | | | | | Merge branch 'bc/connect-plink'Junio C Hamano2015-05-191-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 'jk/test-chain-lint'Junio C Hamano2015-05-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test-lib: turn on GIT_TEST_CHAIN_LINT by defaultjk/test-chain-lintJeff King2015-04-281-1/+1
| * | | | | | | | | | | | | | | t7502-commit.sh: fix a broken and-chainRamsay Jones2015-04-281-1/+1
* | | | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-05-191-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 'jc/gitignore-precedence'Junio C Hamano2015-05-191-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | ignore: info/exclude should trump core.excludesfilejc/gitignore-precedenceJunio C Hamano2015-04-221-0/+10
* | | | | | | | | | | | | | | | | Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-05-192-8/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-232-8/+25
* | | | | | | | | | | | | | | | | Merge branch 'jc/hash-object'Junio C Hamano2015-05-111-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t1007: add hash-object --literally testsEric Sunshine2015-05-051-0/+11
* | | | | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line'Junio C Hamano2015-05-111-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | filter-branch: avoid passing commit message through sedJeff King2015-04-291-0/+10
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git'Junio C Hamano2015-05-111-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 'va/fix-git-p4-tests'Junio C Hamano2015-05-111-8/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-p4: t9814: prevent --chain-lint failureva/fix-git-p4-testsLuke Diamand2015-04-281-8/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-case-fold'Junio C Hamano2015-05-112-1/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-p4: add failing tests for case-folding p4dld/p4-case-foldLuke Diamand2015-04-282-1/+55
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'va/p4-client-path'Junio C Hamano2015-05-111-0/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-p4: improve client path detection when branches are usedva/p4-client-pathVitor Antunes2015-04-231-1/+1
| * | | | | | | | | | | | | | | | | | | t9801: check git-p4's branch detection with client spec enabledVitor Antunes2015-04-221-0/+106
* | | | | | | | | | | | | | | | | | | | Merge branch 'mm/add-p-split-error'Junio C Hamano2015-05-112-11/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | stash -p: demonstrate failure of split with mixed y/nmm/add-p-split-errorMatthieu Moy2015-04-161-0/+23
| * | | | | | | | | | | | | | | | | | | | t3904-stash-patch: factor PERL prereq at the top of the fileMatthieu Moy2015-04-161-6/+12
| * | | | | | | | | | | | | | | | | | | | t3904-stash-patch: fix test descriptionMatthieu Moy2015-04-161-1/+1
| * | | | | | | | | | | | | | | | | | | | add -p: demonstrate failure when running 'edit' after a splitMatthieu Moy2015-04-161-0/+22
| * | | | | | | | | | | | | | | | | | | | t3701-add-interactive: simplify codeMatthieu Moy2015-04-161-4/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | |