summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1Junio C Hamano2013-04-071-0/+27
|\
| * t: check that a pattern without trailing slash matches a directoryJeff King2013-03-281-0/+27
* | Merge branch 'kb/name-hash' into maint-1.8.1Junio C Hamano2013-04-031-0/+20
|\ \
| * | name-hash.c: fix endless loop with core.ignorecase=trueKarsten Blees2013-02-271-0/+20
* | | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1Junio C Hamano2013-04-031-0/+13
|\ \ \
| * | | Fix revision walk for commits with the same datesKacper Kornet2013-03-221-0/+13
| |/ /
* | | Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1Junio C Hamano2013-04-031-73/+96
|\ \ \
| * | | t2003: work around path mangling issue on WindowsJohannes Sixt2013-03-201-2/+2
| * | | entry: fix filter lookupJohn Keeping2013-03-141-0/+26
| * | | t2003: modernize styleJohn Keeping2013-03-141-73/+70
* | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-031-0/+64
|\ \ \ \
| * | | | pack-refs: add fully-peeled traitMichael Haggerty2013-03-181-0/+22
| * | | | pack-refs: write peeled entry for non-tagsJeff King2013-03-171-0/+42
* | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1Junio C Hamano2013-04-031-0/+54
|\ \ \ \ \
| * | | | | tests: make sure rename pretty print worksAntoine Pelisse2013-03-061-0/+54
* | | | | | t1507: Test that branchname@{upstream} is interpreted as branchKacper Kornet2013-03-171-0/+4
* | | | | | perf: update documentation of GIT_PERF_REPEAT_COUNTAntoine Pelisse2013-03-091-1/+1
* | | | | | Merge branch 'mh/maint-ceil-absolute' into maintJunio C Hamano2013-03-071-0/+17
|\ \ \ \ \ \
| * | | | | | Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty2013-02-221-0/+17
* | | | | | | Make !pattern in .gitattributes non-fatalThomas Rast2013-03-011-1/+2
* | | | | | | Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano2013-02-254-0/+21
|\ \ \ \ \ \ \
| * | | | | | | t5551: fix expected error outputJunio C Hamano2013-02-041-2/+1
| * | | | | | | Verify Content-Type from smart HTTP serversShawn Pearce2013-02-044-0/+22
* | | | | | | | Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2013-02-251-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-051-0/+24
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Documentation: "advice" is uncountableGreg Price2013-02-251-1/+1
* | | | | | | | Merge branch 'mz/pick-unborn' into maintJunio C Hamano2013-02-079-40/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | learn to pick/revert into unborn branchMartin von Zweigbergk2012-12-232-0/+17
| * | | | | | | | tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk2012-12-227-40/+15
* | | | | | | | | Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano2013-02-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib.sh: unfilter GIT_PERF_*Nguyễn Thái Ngọc Duy2013-01-151-1/+1
* | | | | | | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2013-02-071-1/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9902: protect test from stray build artifactsJunio C Hamano2013-01-241-1/+24
* | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-071-2/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-311-2/+28
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |