Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awkbw/maint-0090-awk-tweak | Ben Walton | 2014-12-23 | 1 | -1/+1 |
* | Prepare for 2.2.2 | Junio C Hamano | 2014-12-22 | 2 | -1/+34 |
* | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maint | Junio C Hamano | 2014-12-22 | 1 | -4/+10 |
|\ | |||||
| * | Makefile: have python scripts depend on NO_PYTHON settingjk/rebuild-perl-scripts-with-no-perl-seting-change | Jonathan Nieder | 2014-11-18 | 1 | -0/+3 |
| * | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros | Jonathan Nieder | 2014-11-18 | 1 | -5/+5 |
| * | Makefile: have perl scripts depend on NO_PERL setting | Jeff King | 2014-11-18 | 1 | -0/+3 |
* | | Merge branch 'jk/no-perl-tests' into maint | Junio C Hamano | 2014-12-22 | 3 | -4/+4 |
|\ \ | |||||
| * | | t960[34]: mark cvsimport tests as requiring perljk/no-perl-tests | Jeff King | 2014-11-18 | 2 | -3/+3 |
| * | | t0090: mark add-interactive test with PERL prerequisite | Jeff King | 2014-11-18 | 1 | -1/+1 |
* | | | Merge branch 'po/everyday-doc' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Documentation: change "gitlink" typo in git-pushpo/everyday-doc | brian m. carlson | 2014-11-17 | 1 | -1/+1 |
* | | | | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 2 | -6/+34 |
|\ \ \ \ | |||||
| * | | | | push: truly use "simple" as default, not "upstream"jk/push-simple | Jeff King | 2014-11-30 | 2 | -6/+34 |
* | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' into maint | Junio C Hamano | 2014-12-22 | 2 | -1/+9 |
|\ \ \ \ \ | |||||
| * | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checking | Michael Haggerty | 2014-11-18 | 2 | -1/+9 |
* | | | | | | Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: hack around CGI's list-context param() handlingjk/gitweb-with-newer-cgi-multi-param | Jeff King | 2014-11-18 | 1 | -1/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'rs/receive-pack-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labs | René Scharfe | 2014-11-17 | 1 | -1/+1 |
* | | | | | | | Merge branch 'rs/maint-config-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use labs() for variables of type long instead of abs()rs/maint-config-use-labs | René Scharfe | 2014-11-17 | 1 | -2/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/windows-open-eisdir-error' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Windows: correct detection of EISDIR in mingw_open()js/windows-open-eisdir-error | Johannes Sixt | 2014-11-17 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/colors-fix' into maint | Junio C Hamano | 2014-12-22 | 3 | -14/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t4026: test "normal" colorjk/colors-fix | Jeff King | 2014-11-20 | 1 | -0/+8 |
| * | | | | | | | config: fix parsing of "git config --get-color some.key -1" | Jeff King | 2014-11-20 | 1 | -14/+13 |
| * | | | | | | | docs: describe ANSI 256-color mode | Jeff King | 2014-11-20 | 1 | -0/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/checkout-from-tree' into maint | Junio C Hamano | 2014-12-22 | 2 | -0/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-tree | Jeff King | 2014-11-13 | 2 | -0/+35 |
* | | | | | | | | clean: typofix | Alexander Kuleshov | 2014-12-22 | 1 | -1/+1 |
* | | | | | | | | Git 2.2.1v2.2.1 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
* | | | | | | | | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 | 19 | -42/+406 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.1.4v2.1.4 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| * | | | | | | | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 18 | -41/+370 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Git 2.0.5v2.0.5 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | * | | | | | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 17 | -40/+334 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | Git 1.9.5v1.9.5 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | | * | | | | | | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 16 | -39/+297 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Git 1.8.5.6v1.8.5.6 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | | | * | | | | | | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 | 14 | -38/+261 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | | | * | | | | | fsck: complain about NTFS ".git" aliases in trees | Johannes Schindelin | 2014-12-17 | 2 | -3/+9 |
| | | | | * | | | | | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 | 7 | -0/+34 |
| | | | | * | | | | | path: add is_ntfs_dotgit() helper | Johannes Schindelin | 2014-12-17 | 2 | -0/+34 |
| | | | | * | | | | | fsck: complain about HFS+ ".git" aliases in trees | Jeff King | 2014-12-17 | 2 | -4/+7 |
| | | | | * | | | | | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 | 8 | -5/+45 |
| | | | | * | | | | | utf8: add is_hfs_dotgit() helper | Jeff King | 2014-12-17 | 2 | -0/+72 |
| | | | | * | | | | | fsck: notice .git case-insensitively | Jeff King | 2014-12-17 | 2 | -1/+2 |
| | | | | * | | | | | t1450: refactor ".", "..", and ".git" fsck tests | Jeff King | 2014-12-17 | 1 | -30/+27 |
| | | | | * | | | | | verify_dotfile(): reject .git case-insensitively | Jeff King | 2014-12-17 | 2 | -2/+4 |
| | | | | * | | | | | read-tree: add tests for confusing paths like ".." and ".git" | Jeff King | 2014-12-17 | 1 | -0/+32 |