summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* show-branch: fix indentation of usage stringak/show-branch-usage-stringRalf Thielow2015-01-201-3/+3
* show-branch: line-wrap show-branch usageAlexander Kuleshov2015-01-081-1/+4
* Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-072-12/+35
|\
| * Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-072-12/+35
| |\
| | * Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-072-12/+35
| | |\
| | | * is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-292-12/+35
* | | | Git 2.0.5v2.0.5Junio C Hamano2014-12-174-3/+38
* | | | Sync with v1.9.5Junio C Hamano2014-12-1717-40/+334
|\ \ \ \ | |/ / /
| * | | Git 1.9.5v1.9.5Junio C Hamano2014-12-174-3/+38
| * | | Sync with v1.8.5.6Junio C Hamano2014-12-1716-39/+297
| |\ \ \ | | |/ /
| | * | Git 1.8.5.6v1.8.5.6Junio C Hamano2014-12-174-3/+38
| | * | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-1714-38/+261
| | |\ \ | | | |/
| | | * fsck: complain about NTFS ".git" aliases in treesJohannes Schindelin2014-12-172-3/+9
| | | * read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-177-0/+34
| | | * path: add is_ntfs_dotgit() helperJohannes Schindelin2014-12-172-0/+34
| | | * fsck: complain about HFS+ ".git" aliases in treesJeff King2014-12-172-4/+7
| | | * read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-178-5/+45
| | | * utf8: add is_hfs_dotgit() helperJeff King2014-12-172-0/+72
| | | * fsck: notice .git case-insensitivelyJeff King2014-12-172-1/+2
| | | * t1450: refactor ".", "..", and ".git" fsck testsJeff King2014-12-171-30/+27
| | | * verify_dotfile(): reject .git case-insensitivelyJeff King2014-12-172-2/+4
| | | * read-tree: add tests for confusing paths like ".." and ".git"Jeff King2014-12-171-0/+32
| | | * unpack-trees: propagate errors adding entries to the indexJeff King2014-12-171-4/+6
* | | | Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-071-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-071-1/+1
| |\ \ \ | | |/ /
| | * | git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-071-1/+1
* | | | Git 2.0.4v2.0.4Junio C Hamano2014-07-304-3/+9
* | | | commit --amend: test specifies authorship but forgets to checkFabian Ruch2014-07-301-0/+1
* | | | t4013: test diff-tree's --stdin commit formattingJeff King2014-07-281-0/+10
* | | | Merge branch 'jk/alloc-commit-id-maint' into maintJunio C Hamano2014-07-2811-89/+103
|\ \ \ \
| * | | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id-maintJeff King2014-07-281-3/+1
| * | | | object_as_type: set commit indexJeff King2014-07-281-0/+2
| * | | | alloc: factor out commit indexJeff King2014-07-282-2/+8
| * | | | add object_as_type helper for casting objectsJeff King2014-07-287-43/+25
| * | | | parse_object_buffer: do not set object typeJeff King2014-07-281-2/+0
| * | | | move setting of object->type to alloc_* functionsJeff King2014-07-288-12/+13
| * | | | alloc: write out allocator definitionsJeff King2014-07-281-11/+27
| * | | | alloc.c: remove the alloc_raw_commit_node() functionRamsay Jones2014-07-281-18/+29
|/ / / /
* | | | Git 2.0.3v2.0.3Junio C Hamano2014-07-234-3/+21
* | | | .mailmap: combine Stefan Beller's emailsStefan Beller2014-07-231-0/+1
* | | | git.1: switch homepage for statsStefan Beller2014-07-231-1/+1
* | | | Merge branch 'ah/fix-http-push' into maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \
| * | | | http-push.c: make CURLOPT_IOCTLDATA a usable pointerah/fix-http-pushAbbaad Haider2014-07-131-1/+1
* | | | | Merge branch 'po/error-message-style' into maintJunio C Hamano2014-07-221-0/+9
|\ \ \ \ \
| * | | | | doc: give some guidelines for error messagespo/error-message-stylePhilip Oakley2014-07-101-0/+9
* | | | | | Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2014-07-222-0/+32
|\ \ \ \ \ \
| * | | | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsigZoltan Klinger2014-07-092-0/+32
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mg/fix-log-mergetag-color' into maintJunio C Hamano2014-07-221-10/+11
|\ \ \ \ \ \
| * | | | | | log: correctly identify mergetag signature verification statusmg/fix-log-mergetag-colorMichael J Gruber2014-07-101-10/+11
* | | | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2014-07-222-1/+18
|\ \ \ \ \ \ \
View Lorry Controller Status