summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 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.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
* | | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-221-1/+1
|\ \ \ | |/ /
| * | Documentation: fix missing text for rev-parse --verifybrian m. carlson2014-07-221-1/+1
* | | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-164-11/+9
|\ \ \ | |/ /
| * | annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
| * | t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
| * | enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-022-2/+2
* | | Git 1.9.4v1.9.4Junio C Hamano2014-05-304-3/+20
* | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-282-20/+42
|\ \ \
| * | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-192-20/+42
* | | | Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-283-20/+112
|\ \ \ \
| * | | | setup: fix windows path buffer over-steppingmw/symlinksMartin Erik Werner2014-04-241-2/+2
| * | | | setup: don't dereference in-tree symlinks for absolute pathsMartin Erik Werner2014-02-043-22/+12
| * | | | setup: add abspath_part_inside_repo() functionMartin Erik Werner2014-02-041-0/+64
| * | | | t0060: add tests for prefix_path when path begins with work treeMartin Erik Werner2014-02-041-0/+10
| * | | | t0060: add test for prefix_path when path == work treeMartin Erik Werner2014-02-041-0/+6
| * | | | t0060: add test for prefix_path on symlinks via absolute pathsMartin Erik Werner2014-02-041-0/+5
| * | | | t3004: add test for ls-files on symlinks via absolute pathsJunio C Hamano2014-02-041-0/+17
* | | | | Git 1.9.3v1.9.3Junio C Hamano2014-05-092-2/+3
* | | | | shell doc: remove stray "+" in exampleJonathan Nieder2014-05-081-1/+1
* | | | | Start preparing for 1.9.3Junio C Hamano2014-05-082-1/+22
* | | | | Merge branch 'cl/p4-use-diff-tree' into maintJunio C Hamano2014-05-081-1/+1
|\ \ \ \ \
| * | | | | git-p4: format-patch to diff-tree change breaks binary patchescl/p4-use-diff-treeTolga Ceylan2014-05-071-1/+1
* | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-082-24/+54
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-222-24/+54
| | |_|/ / | |/| | |
* | | | | Merge branch 'km/avoid-non-function-return-in-rebase' into maintJunio C Hamano2014-05-084-10/+46
|\ \ \ \ \
| * | | | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebaseKyle J. McKay2014-04-171-10/+1
| * | | | | rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-173-0/+45
* | | | | | Merge branch 'tb/unicode-6.3-zero-width' into maintJunio C Hamano2014-05-081-5/+4
|\ \ \ \ \ \
| * | | | | | utf8.c: partially update to version 6.3Torsten Bögershausen2014-04-091-5/+4
* | | | | | | Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
|\ \ \ \ \ \ \
View Lorry Controller Status