summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* daemon: use callback to build interpolated pathrs/daemon-interpolateRené Scharfe2015-02-171-9/+45
* daemon: look up client-supplied hostname lazilyRené Scharfe2015-02-171-8/+29
* Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-072-12/+35
|\
| * 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.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 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano2014-11-121-1/+1
|\ \ \ \ \
| * | | | | gitignore.txt: fix spelling of "backslash"nd/gitignore-trailing-whitespaceBen North2014-11-041-1/+1
* | | | | | Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano2014-11-111-1/+1
|\ \ \ \ \ \
| * | | | | | clean: use f(void) instead of f() to declare a pointer to a function without ...rs/clean-menu-item-defnRené Scharfe2014-08-181-1/+1
* | | | | | | Documentation/config.txt: fix minor typoThomas Quinot2014-11-101-1/+1
* | | | | | | config.txt: fix typoNicolas Dermine2014-11-101-1/+1
* | | | | | | docs/credential-store: s/--store/--file/Jeff King2014-11-061-1/+1
* | | | | | | Git 2.1.3v2.1.3Junio C Hamano2014-10-294-3/+30
* | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-292-0/+10
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splittingJeff King2014-10-192-0/+10
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'da/mergetool-meld' into maintJunio C Hamano2014-10-292-2/+16
|\ \ \ \ \ \ \
| * | | | | | | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-162-2/+16
* | | | | | | | Merge branch 'rm/gitweb-start-form' into maintJunio C Hamano2014-10-291-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: use start_form, not startform that was removed in CGI.pm 4.04rm/gitweb-start-formRoland Mas2014-10-161-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bc/asciidoc-pretty-formats-fix' into maintJunio C Hamano2014-10-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: fix misrender of pretty-formats in Asciidoctorbc/asciidoc-pretty-formats-fixbrian m. carlson2014-10-081-1/+1
* | | | | | | | | Merge branch 'rs/daemon-fixes' into maintJunio C Hamano2014-10-291-18/+15
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | daemon: remove write-only variable maxfdrs/daemon-fixesRené Scharfe2014-10-011-4/+0
| * | | | | | | | daemon: fix error message after bind()René Scharfe2014-10-011-1/+1
| * | | | | | | | daemon: handle gethostbyname() errorRené Scharfe2014-10-011-13/+14
* | | | | | | | | Merge branch 'maint-2.0' into maintJunio C Hamano2014-10-071-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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
| | | |/ / / / /