summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| | |_|_|/ / | |/| | | |
* | | | | | 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 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-101-0/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2012-08-061-1/+1
| * | | | | | | | | | | t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey2012-08-061-0/+35
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-103-0/+128
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fsck: detect null sha1 in tree entriesJeff King2012-07-291-0/+26
| * | | | | | | | | | | do not write null sha1s to on-disk indexJeff King2012-07-291-0/+19
| * | | | | | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-0/+83
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2012-09-101-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | send-email: improve RFC2047 quote parsingThomas Rast2012-07-311-0/+13
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mk/test-seq' into maint-1.7.11Junio C Hamano2012-08-243-2/+23
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | tests: Introduce test_seqMichaƂ Kiedrowicz2012-08-043-2/+23
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rj/maint-grep-remove-redundant-test' into maintJunio C Hamano2012-08-151-11/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | t7810-*.sh: Remove redundant testRamsay Jones2012-07-291-11/+0
| |/ / / / / /
* | | | | | | Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano2012-07-301-0/+17
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2012-07-171-0/+17
| |\ \ \ \ \ \ \
| | * | | | | | | commit-tree: resurrect command line parsing updatesJunio C Hamano2012-07-171-0/+17
* | | | | | | | | Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-301-0/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: test precedence of external diff driversJeff King2012-07-191-0/+40