summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/git-p4-for-python-2.4' into maintJunio C Hamano2013-02-041-5/+6
|\
| * git-p4.py: support Python 2.4Brandon Casey2013-01-261-5/+6
* | Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-041-0/+44
|\ \
| * | merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-2/+2
| * | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-0/+44
* | | Merge branch 'tb/t0050-maint' into maintJunio C Hamano2013-01-301-35/+17
|\ \ \
| * | | t0050: Use TAB for indentationTorsten Bögershausen2013-01-211-33/+15
| * | | t0050: honor CASE_INSENSITIVE_FS in add (with different case)Torsten Bögershausen2013-01-211-1/+1
| * | | t0050: known breakage vanished in merge (case change)Torsten Bögershausen2013-01-211-1/+1
* | | | Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano2013-01-281-0/+146
|\ \ \ \
| * | | | git-status: Test --ignored behaviorAntoine Pelisse2013-01-011-0/+146
| |/ / /
* | | | Merge branch 'mh/ceiling' into maintJunio C Hamano2013-01-282-58/+13
|\ \ \ \
| * | | | string_list_longest_prefix(): remove functionMichael Haggerty2012-10-291-30/+0
| * | | | longest_ancestor_length(): require prefix list entries to be normalizedMichael Haggerty2012-10-291-28/+13
* | | | | Merge branch 'rs/zip-tests' into maintJunio C Hamano2013-01-205-80/+140
|\ \ \ \ \
| * | | | | t5003: check if unzip supports symlinksRené Scharfe2013-01-072-7/+19
| * | | | | t5000, t5003: move ZIP tests into their own scriptRené Scharfe2013-01-072-69/+119
| * | | | | t0024, t5000: use test_lazy_prereq for UNZIPRené Scharfe2013-01-072-14/+10
| * | | | | t0024, t5000: clear variable UNZIP, use GIT_UNZIP insteadRené Scharfe2013-01-063-8/+10
* | | | | | Merge branch 'jk/unify-exit-code-by-receiving-signal' into maintJunio C Hamano2013-01-141-1/+1
|\ \ \ \ \ \
| * | | | | | run-command: encode signal death as a positive integerJeff King2013-01-061-1/+1
* | | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-141-1/+11
|\ \ \ \ \ \ \
| * | | | | | | clone: support atomic operation with --separate-git-dirJens Lehmann2013-01-051-1/+11
* | | | | | | | Merge branch 'mk/maint-graph-infinity-loop' into maintJunio C Hamano2013-01-141-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | graph.c: infinite loop in git whatchanged --graph -mMichał Kiedrowicz2012-09-251-0/+10
* | | | | | | | | Merge branch 'jk/enable-test-lint-by-default' into maintJunio C Hamano2013-01-111-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: turn on test-lint by defaultJeff King2013-01-031-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-111-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-031-0/+14
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'as/test-name-alias-uniquely' into maintJunio C Hamano2013-01-111-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use longer alias names in subdirectory testsAaron Schrab2012-12-281-6/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ja/directory-attrs' into maintJunio C Hamano2013-01-111-0/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add directory pattern matching to attributesJean-Noël AVILA2012-12-171-0/+57
* | | | | | | | | | Merge branch 'jc/fetch-ignore-symref' into maintJunio C Hamano2013-01-111-0/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch: ignore wildcarded refspecs that update local symbolic refsJunio C Hamano2012-12-111-0/+42
* | | | | | | | | | | Merge branch 'tb/test-t9810-no-sed-i' into maintJunio C Hamano2013-01-101-10/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t9810: Do not use sed -iTorsten Bögershausen2013-01-011-10/+14
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tb/test-t9020-no-which' into maintJunio C Hamano2013-01-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t9020: which is not portableTorsten Bögershausen2013-01-011-2/+2
* | | | | | | | | | | | Merge branch 'sp/shortlog-missing-lf' into maintJunio C Hamano2013-01-101-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | shortlog: fix wrapping lines of wraplenSteffen Prohaska2012-12-111-0/+24
* | | | | | | | | | | | | Merge branch 'nd/invalidate-i-t-a-cache-tree' into maintJunio C Hamano2013-01-101-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cache-tree: invalidate i-t-a paths after generating treesNguyễn Thái Ngọc Duy2012-12-151-0/+20
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | t1402: work around shell quoting issue on NetBSDRené Scharfe2013-01-081-2/+4
* | | | | | | | | | | | | Merge branch 'jc/test-portability' into maintJunio C Hamano2013-01-082-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9020: use configured Python to run the test helperJunio C Hamano2012-12-191-3/+7
| * | | | | | | | | | | | | t3600: Avoid "cp -a", which is a GNUismJunio C Hamano2012-12-191-3/+3
| * | | | | | | | | | | | | Merge branch 'jc/maint-test-portability' into 'jc/test-portability'Junio C Hamano2012-12-193-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maintJunio C Hamano2013-01-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t9200: let "cvs init" create the test repositoryJunio C Hamano2012-12-241-1/+2
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
View Lorry Controller Status