summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge branch 'js/windows-open-eisdir-error' into maintJunio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Windows: correct detection of EISDIR in mingw_open()js/windows-open-eisdir-errorJohannes Sixt2014-11-171-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-223-14/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t4026: test "normal" colorjk/colors-fixJeff King2014-11-201-0/+8
| * | | | | | | | | | | | | | | | | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-201-14/+13
| * | | | | | | | | | | | | | | | | docs: describe ANSI 256-color modeJeff King2014-11-201-0/+4
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-222-0/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-132-0/+35
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | clean: typofixAlexander Kuleshov2014-12-221-1/+1
* | | | | | | | | | | | | | | | | Git 2.2.1v2.2.1Junio C Hamano2014-12-174-3/+38
* | | | | | | | | | | | | | | | | Sync with v2.1.4Junio C Hamano2014-12-1719-42/+406
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Git 2.1.4v2.1.4Junio C Hamano2014-12-174-3/+38
| * | | | | | | | | | | | | | | | Sync with v2.0.5Junio C Hamano2014-12-1718-41/+370
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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' of git://github.com/git-l10n/git-po into maintJunio C Hamano2014-12-051-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin2014-11-291-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | l10n: de.po: fix typosHartmut Henkel2014-11-281-9/+9
* | | | | | | | | | | | | | | | Start post 2.2 cycleJunio C Hamano2014-12-051-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Git 2.2v2.2.0Junio C Hamano2014-11-262-1/+6
* | | | | | | | | | | | | | | RelNotes: spelling & grammar tweaksMarc Branchaud2014-11-261-51/+52
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Git 2.2.0-rc3v2.2.0-rc3Junio C Hamano2014-11-212-14/+15
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | l10n: remove a superfluous translation for push.cJiang Xin2014-11-206-30/+6
* | | | | | | | | | | | | l10n: de.po: translate 2 messagesRalf Thielow2014-11-201-3/+1
* | | | | | | | | | | | | l10n: de.po: translate 2 new messagesRalf Thielow2014-11-201-2/+2
* | | | | | | | | | | | | l10n: batch updates for one trivial changeJiang Xin2014-11-207-519/+554
* | | | | | | | | | | | | l10n: git.pot: v2.2.0 round 2 (1 updated)Jiang Xin2014-11-201-24/+24
* | | | | | | | | | | | | Merge branch 'sv/submitting-final-patch'Junio C Hamano2014-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SubmittingPatches: final submission is To: maintainer and CC: listsv/submitting-final-patchSlavomir Vlcek2014-11-131-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sn/tutorial-status-output-example'Junio C Hamano2014-11-192-19/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gittutorial: fix output of 'git status'sn/tutorial-status-output-exampleStefan Naewe2014-11-132-19/+21
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mh/doc-remote-helper-xref'Junio C Hamano2014-11-195-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | doc: add some crossrefs between manual pagesmh/doc-remote-helper-xrefMax Horn2014-11-115-0/+22
* | | | | | | | | | | | | | Merge branch 'tb/no-relative-file-url'Junio C Hamano2014-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t5705: the file:// URL should be absolutetb/no-relative-file-urlTorsten Bögershausen2014-11-131-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |