summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pretty-G-format-fixes'Junio C Hamano2014-07-092-9/+68
|\
| * move "%G" format test from t7510 to t6006jk/pretty-G-format-fixesJeff King2014-06-252-6/+6
| * pretty: avoid reading past end-of-string with "%G"Jeff King2014-06-171-0/+6
| * t7510: check %G* pretty-format outputJeff King2014-06-171-0/+40
| * t7510: test a commit signed by an unknown keyJeff King2014-06-171-0/+13
| * t7510: use consistent &&-chains in loopMichael J Gruber2014-06-171-6/+6
| * t7510: stop referring to master in later testsJeff King2014-06-171-3/+3
* | Merge branch 'dt/refs-check-refname-component-sse'Junio C Hamano2014-07-022-0/+23
|\ \
| * | refs.c: SSE2 optimizations for check_refname_componentdt/refs-check-refname-component-sseDavid Turner2014-06-182-0/+23
* | | Merge branch 'ye/http-extract-charset'Junio C Hamano2014-07-022-0/+9
|\ \ \
| * | | http: fix charset detection of extract_content_type()ye/http-extract-charsetYi EungJun2014-06-172-0/+9
* | | | Merge branch 'bc/fix-rebase-merge-skip'Junio C Hamano2014-07-021-0/+15
|\ \ \ \
| * | | | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skipbrian m. carlson2014-06-161-0/+15
| * | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-281-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-282-0/+38
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'maint'Junio C Hamano2014-07-021-2/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
| * | | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-252-59/+100
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+72
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-253-10/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-251-0/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-251-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-251-0/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2014-06-251-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-251-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-251-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-251-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/pretty-truncate' into maintJunio C Hamano2014-06-254-71/+276
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-121-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-06-258-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-2/+2
| * | | | | | | | | | | | | | | | | | | | t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-4/+4
| * | | | | | | | | | | | | | | | | | | | t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
| * | | | | | | | | | | | | | | | | | | | t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-4/+4
| * | | | | | | | | | | | | | | | | | | | t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-3/+3
| * | | | | | | | | | | | | | | | | | | | t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces'Junio C Hamano2014-06-251-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes speciallypb/trim-trailing-spacesJunio C Hamano2014-06-131-6/+8
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sp/complete-ext-alias'Junio C Hamano2014-06-251-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliasessp/complete-ext-aliasSteffen Prohaska2014-06-131-0/+27
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-writebitmaps-config'Junio C Hamano2014-06-253-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t7700: drop explicit --no-pack-kept-objects from .keep testjk/repack-pack-writebitmaps-configJeff King2014-06-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | repack: introduce repack.writeBitmaps config optionJeff King2014-06-103-2/+5
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/init-restore-env'Junio C Hamano2014-06-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | git potty: restore environments after alias expansionnd/init-restore-envNguyễn Thái Ngọc Duy2014-06-101-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano2014-06-251-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |