summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-071-0/+15
|\
| * Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-071-0/+15
| |\
| | * Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-071-0/+15
| | |\
| | | * Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-071-0/+15
| | | |\
| | | | * is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-291-0/+15
* | | | | Sync with v2.0.5Junio C Hamano2014-12-173-31/+102
|\ \ \ \ \ | |/ / / /
| * | | | Sync with v1.9.5Junio C Hamano2014-12-173-31/+102
| |\ \ \ \ | | |/ / /
| | * | | Sync with v1.8.5.6Junio C Hamano2014-12-173-31/+102
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-173-31/+102
| | | |\ \ | | | | |/
| | | | * fsck: complain about NTFS ".git" aliases in treesJohannes Schindelin2014-12-171-2/+7
| | | | * read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-171-0/+13
| | | | * fsck: complain about HFS+ ".git" aliases in treesJeff King2014-12-171-3/+5
| | | | * read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-172-5/+25
| | | | * fsck: notice .git case-insensitivelyJeff King2014-12-171-0/+1
| | | | * t1450: refactor ".", "..", and ".git" fsck testsJeff King2014-12-171-30/+27
| | | | * verify_dotfile(): reject .git case-insensitivelyJeff King2014-12-171-0/+1
| | | | * read-tree: add tests for confusing paths like ".." and ".git"Jeff King2014-12-171-0/+32
* | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-291-0/+9
|\ \ \ \ \
| * | | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splittingJeff King2014-10-191-0/+9
| |/ / / /
* | | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-075-0/+49
|\ \ \ \ \
| * | | | | mailinfo: make ">From" in-body header check more robustJeff King2014-09-165-0/+49
* | | | | | Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-292-7/+83
|\ \ \ \ \ \
| * | | | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fixJeff King2014-09-121-0/+56
| * | | | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-102-7/+27
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-291-0/+20
|\ \ \ \ \ \
| * | | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-181-0/+20
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-291-0/+22
|\ \ \ \ \ \
| * | | | | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-headMax Kirillov2014-09-031-0/+22
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-291-0/+104
|\ \ \ \ \ \
| * | | | | | fast-import: fix segfault in store_tree()mb/fast-import-delete-rootMaxim Bublis2014-08-291-2/+2
| * | | | | | t9300: test filedelete commandMaxim Bublis2014-08-291-0/+104
| |/ / / / /
* | | | | | Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-292-0/+107
|\ \ \ \ \ \
| * | | | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecsJeff King2014-08-262-0/+107
| |/ / / / /
* | | | | | Merge branch 'jk/prune-top-level-refs-after-packing' into maintJunio C Hamano2014-09-191-0/+7
|\ \ \ \ \ \
| * | | | | | pack-refs: prune top-level refs like "refs/foo"jk/prune-top-level-refs-after-packingJeff King2014-08-251-0/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-191-0/+17
|\ \ \ \ \ \
| * | | | | | checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletionJonathan Nieder2014-08-251-0/+17
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs/refresh-beyond-symlink' into maintJunio C Hamano2014-09-191-0/+43
|\ \ \ \ \ \
| * | | | | | read-cache: check for leading symlinks when refreshing indexrs/refresh-beyond-symlinkRené Scharfe2014-08-101-0/+43
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'lf/bundle-exclusion' into maintJunio C Hamano2014-09-191-1/+4
|\ \ \ \ \ \
| * | | | | | bundle: fix exclusion of annotated tagslf/bundle-exclusionLukas Fleischer2014-08-071-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano2014-09-192-0/+28
|\ \ \ \ \ \
| * | | | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-071-0/+11
| * | | | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-071-0/+17
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-161-2/+2
| |\ \ \ \ \ | | |/ / / /
* | | | | | Merge branch 'jk/command-line-config-empty-string' into maintJunio C Hamano2014-09-191-0/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-stringJunio C Hamano2014-08-051-0/+11
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-261-0/+34
|\ \ \ \ \
| * | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-201-0/+34
* | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-261-0/+39
|\ \ \ \ \ \