summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pack-objects: use --objects-edge-aggressive for shallow reposbc/fetch-thin-less-aggressive-in-normal-repositorybrian m. carlson2014-12-295-4/+20
* rev-list: add an option to mark fewer edges as uninterestingbrian m. carlson2014-12-296-4/+16
* Documentation: add missing article in rev-list-options.txtbrian m. carlson2014-12-221-1/+1
* Sync with v2.2.1Junio C Hamano2014-12-1820-43/+442
|\
| * 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
* | | | | | | Second batch for 2.3 cycleJunio C Hamano2014-12-121-0/+18
* | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-12-124-18/+29
|\ \ \ \ \ \ \
| * | | | | | | pack-bitmap: do not use gcc packed attributeKarsten Blees2014-11-304-18/+29
* | | | | | | | Merge branch 'jk/push-simple'Junio C Hamano2014-12-122-6/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-302-6/+34
* | | | | | | | | Merge branch 'da/difftool-mergetool-simplify-reporting-status'Junio C Hamano2014-12-126-29/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-statusDavid Aguilar2014-11-213-3/+0
| * | | | | | | | | mergetool: simplify conditionalsDavid Aguilar2014-11-211-11/+5
| * | | | | | | | | difftool--helper: add explicit exit statementDavid Aguilar2014-11-211-0/+2
| * | | | | | | | | mergetool--lib: remove use of $status globalDavid Aguilar2014-11-211-14/+5
| * | | | | | | | | mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano2014-11-211-1/+0
* | | | | | | | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-123-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 'rt/push-recurse-submodule-usage-string'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/push.c: fix description of --recurse-submodules optionrt/push-recurse-submodule-usage-stringRalf Thielow2014-11-181-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change'Junio C Hamano2014-12-121-4/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: have python scripts depend on NO_PYTHON settingjk/rebuild-perl-scripts-with-no-perl-seting-changeJonathan Nieder2014-11-181-0/+3
| * | | | | | | | | | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macrosJonathan Nieder2014-11-181-5/+5
| * | | | | | | | | | Makefile: have perl scripts depend on NO_PERL settingJeff King2014-11-181-0/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/no-perl-tests'Junio C Hamano2014-12-123-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t960[34]: mark cvsimport tests as requiring perljk/no-perl-testsJeff King2014-11-182-3/+3
| * | | | | | | | | | t0090: mark add-interactive test with PERL prerequisiteJeff King2014-11-181-1/+1
* | | | | | | | | | | Merge branch 'sv/typofix-apply-error-message'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \