summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gettext.h: add parentheses around N_ expansion if supportedkm/gettext-nKyle J. McKay2015-01-123-0/+45
* Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-072-12/+35
|\
| * 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
* | | | | | Prepare for 2.2.2Junio C Hamano2014-12-222-1/+34
* | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano2014-12-221-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' into maintJunio C Hamano2014-12-223-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 'po/everyday-doc' into maintJunio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: change "gitlink" typo in git-pushpo/everyday-docbrian m. carlson2014-11-171-1/+1
* | | | | | | | | Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-222-6/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-302-6/+34
* | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-222-1/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checkingMichael Haggerty2014-11-182-1/+9
* | | | | | | | | | | Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maintJunio C Hamano2014-12-221-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: hack around CGI's list-context param() handlingjk/gitweb-with-newer-cgi-multi-paramJeff King2014-11-181-1/+5
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano2014-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labsRené Scharfe2014-11-171-1/+1
* | | | | | | | | | | | Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano2014-12-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | use labs() for variables of type long instead of abs()rs/maint-config-use-labsRené Scharfe2014-11-171-2/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | 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