aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Git 2.2.2v2.2.2Junio C Hamano2015-01-12
* Merge branch 'jk/read-packed-refs-without-path-max' into maintJunio C Hamano2015-01-12
|\
| * read_packed_refs: use skip_prefix instead of static arrayJeff King2014-12-10
| * read_packed_refs: pass strbuf to parse_ref_lineJeff King2014-12-10
| * read_packed_refs: use a strbuf for reading linesJeff King2014-12-10
* | Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-12
|\ \
| * | add: ignore only ignored filesMichael J Gruber2014-11-21
* | | Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano2015-01-12
|\ \ \
| * | | sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrevMike Hommey2014-11-26
* | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2015-01-12
|\ \ \ \
| * | | | approxidate: allow ISO-like dates far in the futureJeff King2014-11-13
| * | | | pass TIME_DATE_NOW to approxidate future-checkJeff King2014-11-13
* | | | | Merge branch 'rw/apply-does-not-take-ignore-date' into maintJunio C Hamano2015-01-12
|\ \ \ \ \
| * | | | | git-am.txt: --ignore-date flag is not passed to git-applyRonald Wampler2014-12-09
* | | | | | Merge branch 'jk/for-each-reflog-ent-reverse' into maintJunio C Hamano2015-01-12
|\ \ \ \ \ \
| * | | | | | for_each_reflog_ent_reverse: turn leftover check into assertionJeff King2014-12-05
| * | | | | | for_each_reflog_ent_reverse: fix newlines on block boundariesJeff King2014-12-05
* | | | | | | Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-07
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-2.0' into maint-2.1Junio C Hamano2015-01-07
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2015-01-07
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2015-01-07
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2015-01-07
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | is_hfs_dotgit: loosen over-eager match of \u{..47}Jeff King2014-12-29
* | | | | | | | | | | | Prepare for 2.2.2Junio C Hamano2014-12-22
* | | | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Makefile: have python scripts depend on NO_PYTHON settingJonathan Nieder2014-11-18
| * | | | | | | | | | | | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macrosJonathan Nieder2014-11-18
| * | | | | | | | | | | | Makefile: have perl scripts depend on NO_PERL settingJeff King2014-11-18
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/no-perl-tests' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t960[34]: mark cvsimport tests as requiring perlJeff King2014-11-18
| * | | | | | | | | | | | t0090: mark add-interactive test with PERL prerequisiteJeff King2014-11-18
* | | | | | | | | | | | | Merge branch 'po/everyday-doc' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: change "gitlink" typo in git-pushbrian m. carlson2014-11-17
* | | | | | | | | | | | | | Merge branch 'jk/push-simple' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | push: truly use "simple" as default, not "upstream"Jeff King2014-11-30
* | | | | | | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configMichael Haggerty2014-11-18
* | | | | | | | | | | | | | | | Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | gitweb: hack around CGI's list-context param() handlingJeff King2014-11-18
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | use labs() for variables of type long instead of abs()René Scharfe2014-11-17
* | | | | | | | | | | | | | | | | Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | use labs() for variables of type long instead of abs()René Scharfe2014-11-17
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'js/windows-open-eisdir-error' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Windows: correct detection of EISDIR in mingw_open()Johannes Sixt2014-11-17
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t4026: test "normal" colorJeff King2014-11-20
| * | | | | | | | | | | | | | | | | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-20
| * | | | | | | | | | | | | | | | | docs: describe ANSI 256-color modeJeff King2014-11-20
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2014-12-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \