summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-141-1/+13
|\
| * attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-081-1/+1
| * merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-081-1/+13
* | Merge branch 'mh/abspath'Junio C Hamano2012-09-142-18/+59
|\ \
| * | t0060: split absolute path test in two to exercise some of it on WindowsJohannes Sixt2012-09-101-2/+6
| * | t0060: verify that real_path() removes extra slashesMichael Haggerty2012-09-061-0/+18
| * | real_path(): properly handle nonexistent top-level pathsMichael Haggerty2012-09-061-1/+1
| * | t0060: verify that real_path() works correctly with absolute pathsMichael Haggerty2012-09-061-1/+11
| * | real_path(): reject the empty stringMichael Haggerty2012-09-061-1/+1
| * | t0060: verify that real_path() fails if passed the empty stringMichael Haggerty2012-09-061-0/+4
| * | absolute_path(): reject the empty stringMichael Haggerty2012-09-061-1/+1
| * | t0060: verify that absolute_path() fails if passed the empty stringMichael Haggerty2012-09-061-0/+4
| * | t0060: move tests of real_path() from t0000 to hereMichael Haggerty2012-09-062-18/+19
* | | Merge branch 'dj/fetch-all-tags'Junio C Hamano2012-09-141-0/+30
|\ \ \
| * | | fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2012-09-071-0/+30
* | | | Merge branch 'rj/tap-fix'Junio C Hamano2012-09-144-63/+81
|\ \ \ \
| * | | | test-lib.sh: Suppress the "passed all ..." message if no tests runRamsay Jones2012-09-021-1/+4
| * | | | test-lib.sh: Add check for invalid use of 'skip_all' facilityRamsay Jones2012-09-021-0/+4
| * | | | test-lib.sh: Fix some shell coding style violationsRamsay Jones2012-09-021-22/+38
| * | | | t4016-*.sh: Skip all tests rather than each testRamsay Jones2012-09-021-11/+9
| * | | | t3902-*.sh: Skip all tests rather than each testRamsay Jones2012-09-021-16/+15
| * | | | t3300-*.sh: Fix a TAP parse errorRamsay Jones2012-09-021-13/+11
* | | | | Merge branch 'nd/maint-remote-remove'Junio C Hamano2012-09-122-3/+3
|\ \ \ \ \
| * | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-062-3/+3
| |/ / / /
| * | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-08-243-2/+23
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'rj/test-regex'Junio C Hamano2012-09-111-0/+5
|\ \ \ \ \
| * | | | | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-021-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-101-0/+70
|\ \ \ \ \
| * | | | | branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-301-0/+34
| * | | | | branch: add --unset-upstream optionCarlos Martín Nieto2012-08-301-0/+22
| * | | | | branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-231-0/+14
| | |/ / / | |/| | |
* | | | | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-102-0/+25
|\ \ \ \ \
| * | | | | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-301-1/+1
| * | | | | demonstrate broken 'git cherry-pick three one two'Martin von Zweigbergk2012-08-301-0/+15
| * | | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-301-0/+10
* | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'Junio C Hamano2012-09-101-0/+12
|\ \ \ \ \ \
| * | | | | | log: fix --quiet synonym for -sJeff King2012-08-281-0/+12
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'mk/test-seq' into maint-1.7.11Junio C Hamano2012-08-243-2/+23
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/maint-http-half-auth-push'Junio C Hamano2012-09-076-75/+127
|\ \ \ \ \ \ \
| * | | | | | | http: prompt for credentials on failed POSTJeff King2012-08-271-1/+1
| * | | | | | | t: test http access to "half-auth" repositoriesJeff King2012-08-273-0/+28
| * | | | | | | t: test basic smart-http authenticationJeff King2012-08-272-0/+25
| * | | | | | | t/lib-httpd: recognize */smart/* repos as smart-httpJeff King2012-08-271-9/+7
| * | | | | | | t/lib-httpd: only route auth/dumb to dumb reposJeff King2012-08-271-1/+1
| * | | | | | | t5550: factor out http auth setupJeff King2012-08-273-54/+55
| * | | | | | | t5550: put auth-required repo in auth/dumbJeff King2012-08-271-9/+9
* | | | | | | | Merge branch 'jc/apply-binary-p0'Junio C Hamano2012-09-071-21/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-21/+33
* | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory'Junio C Hamano2012-09-072-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-232-0/+21
| | |_|/ / / / / / | |/| | | | | | |