summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra2012-09-171-2/+3
* Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-142-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
* | Sync with 1.7.11.7Junio C Hamano2012-09-142-0/+17
|\ \
| * \ Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2012-09-141-0/+12
| |\ \
| | * | log: fix --quiet synonym for -sJeff King2012-08-281-0/+12
| * | | Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-141-0/+5
| |\ \ \
| | * | | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-021-0/+5
* | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1210-96/+191
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-121-21/+33
| |\ \ \ \
| | * | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-21/+33
| * | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-122-0/+21
| |\ \ \ \ \
| | * | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-232-0/+21
| * | | | | | Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-126-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 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-121-0/+10
| |\ \ \ \ \ \ \
| | * | | | | | | for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-211-1/+1
| | * | | | | | | t6300: test sort with multiple keysKacper Kornet2012-08-211-0/+10
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Sync with 1.7.11.6Junio C Hamano2012-09-115-13/+127
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-111-0/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-241-0/+12
| * | | | | | | | Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-111-0/+38
| |\ \ \ \ \ \ \ \
| | * | | | | | | | stash: invoke rerere in case of conflictPhil Hord2012-08-171-1/+1
| | * | | | | | | | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-111-4/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-141-4/+22
| * | | | | | | | | Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-111-1/+17
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | add tests for 'git rebase --keep-empty'Martin von Zweigbergk2012-08-091-1/+17
| * | | | | | | | | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-111-0/+30
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-051-0/+30
| * | | | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-111-8/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano2012-07-301-8/+8
* | | | | | | | | | | | | Merge branch 'jc/test-prereq' into maintJunio C Hamano2012-09-116-205/+233
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t3910: use the UTF8_NFD_TO_NFC test prereqMichael J Gruber2012-08-221-146/+135
| * | | | | | | | | | | | | test-lib: provide UTF8 behaviour as a prerequisiteMichael J Gruber2012-07-273-17/+25
| * | | | | | | | | | | | | t0050: use the SYMLINKS test prereqMichael J Gruber2012-07-271-14/+7
| * | | | | | | | | | | | | t0050: use the CASE_INSENSITIVE_FS test prereqMichael J Gruber2012-07-271-13/+8
| * | | | | | | | | | | | | test-lib: provide case insensitivity as a prerequisiteMichael J Gruber2012-07-273-10/+10
| * | | | | | | | | | | | | test: allow prerequisite to be evaluated lazilyJunio C Hamano2012-07-272-3/+46
| * | | | | | | | | | | | | test: rename $satisfied to $satisfied_prereqJunio C Hamano2012-07-271-3/+3
* | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-105-0/+176
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-101-0/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status