summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/libperl-git-config'Junio C Hamano2011-10-262-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add simple test for Git::config_path() in t/t9700-perl-git.shJakub Narebski2011-10-212-1/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune'Junio C Hamano2011-10-261-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruningCarlos Martín Nieto2011-10-151-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto2011-10-151-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5510: add tests for fetch --pruneCarlos Martín Nieto2011-10-071-0/+50
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-update'Junio C Hamano2011-10-215-324/+731
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle files with shell metacharactersLuke Diamand2011-10-171-0/+64
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle utf16 filetype properlyPete Wyckoff2011-10-171-0/+108
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-p4 tests: refactor and cleanupPete Wyckoff2011-10-173-324/+559
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sc/difftool-skip'Junio C Hamano2011-10-211-1/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: avoid arithmetic expansion notationsc/difftool-skipJunio C Hamano2011-10-141-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-101-1/+42
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile'Junio C Hamano2011-10-211-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test showing git-fetch groks gitfilesPhil Hord2011-10-041-0/+14
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: add missing executable bitsJeff King2011-10-202-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir scriptBrandon Casey2011-10-191-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-191-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-0/+23
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-191-0/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+92
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-191-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-061-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-0/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano2011-10-191-0/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: Search for merges only at end of recursive mergeBrad King2011-10-131-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-131-0/+51
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-191-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+43
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-191-12/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt2011-10-191-12/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/httpd-test-fix-port'Junio C Hamano2011-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use test number as port numbercb/httpd-test-fix-portClemens Buchacher2011-10-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/mingw-misc-fixes'Junio C Hamano2011-10-184-20/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9901: fix line-ending dependency on windowsPat Thoyts2011-10-151-15/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGWJohannes Schindelin2011-10-141-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9001: do not fail only due to CR/LF issuesJohannes Schindelin2011-10-141-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1020: disable the pwd test on MinGWJohannes Schindelin2011-10-141-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/http-auth'Junio C Hamano2011-10-172-8/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http: use hostname in credential descriptionMichael J Gruber2011-10-151-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve httpd auth testsJeff King2011-07-202-8/+53
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw'Junio C Hamano2011-10-171-36/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on WindowsJohannes Sixt2011-10-131-36/+52
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-171-83/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1300: test mixed-case variable retrievalJeff King2011-10-121-0/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1300: put git invocations inside test functionJeff King2011-10-121-83/+93
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-171-1/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-111-1/+58
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display'Junio C Hamano2011-10-171-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-101-0/+6
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |