summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation/git-rebase: fix --no-autostash formattingjk/rebase-no-autostashJohn Keeping2015-09-101-1/+2
* rebase: support --no-autostashJohn Keeping2015-09-102-1/+14
* Git 2.2.3v2.2.3maint-2.2Junio C Hamano2015-09-044-3/+13
* Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano2015-09-044-24/+27
|\
| * show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
| * read_info_alternates: handle paths larger than PATH_MAXJeff King2015-09-041-6/+3
| * notes: use a strbuf in add_non_noteJeff King2015-09-041-9/+10
| * verify_absent: allow filenames longer than PATH_MAXJeff King2015-09-041-7/+10
|/
* Git 2.2.2v2.2.2Junio C Hamano2015-01-123-2/+33
* Merge branch 'jk/read-packed-refs-without-path-max' into maintJunio C Hamano2015-01-121-21/+25
|\
| * read_packed_refs: use skip_prefix instead of static arrayjk/read-packed-refs-without-path-maxJeff King2014-12-101-3/+2
| * read_packed_refs: pass strbuf to parse_ref_lineJeff King2014-12-101-12/+15
| * read_packed_refs: use a strbuf for reading linesJeff King2014-12-101-9/+11
* | Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-122-2/+8
|\ \
| * | add: ignore only ignored filesmg/add-ignore-errorsMichael J Gruber2014-11-212-2/+8
* | | Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano2015-01-121-1/+1
|\ \ \
| * | | sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrevmh/find-uniq-abbrevMike Hommey2014-11-261-1/+1
* | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2015-01-122-9/+15
|\ \ \ \
| * | | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-datesJeff King2014-11-132-2/+5
| * | | | pass TIME_DATE_NOW to approxidate future-checkJeff King2014-11-131-7/+10
* | | | | Merge branch 'rw/apply-does-not-take-ignore-date' into maintJunio C Hamano2015-01-121-1/+0
|\ \ \ \ \
| * | | | | git-am.txt: --ignore-date flag is not passed to git-applyrw/apply-does-not-take-ignore-dateRonald Wampler2014-12-091-1/+0
* | | | | | Merge branch 'jk/for-each-reflog-ent-reverse' into maintJunio C Hamano2015-01-122-12/+67
|\ \ \ \ \ \
| * | | | | | for_each_reflog_ent_reverse: turn leftover check into assertionjk/for-each-reflog-ent-reverseJeff King2014-12-051-1/+1
| * | | | | | for_each_reflog_ent_reverse: fix newlines on block boundariesJeff King2014-12-052-11/+66
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status