summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* json_writer: new routines to create data in JSON formatjh/json-writerJeff Hostetler2018-03-285-0/+1312
* Git 2.17-rc1v2.17.0-rc1Junio C Hamano2018-03-212-1/+33
* Merge branch 'jk/attributes-path-doc'Junio C Hamano2018-03-211-3/+10
|\
| * doc/gitattributes: mention non-recursive behaviorjk/attributes-path-docJeff King2018-03-201-3/+10
* | Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano2018-03-214-6/+8
|\ \
| * | read-cache: fix an -Wmaybe-uninitialized warningrj/warning-uninitialized-fixRamsay Jones2018-03-201-2/+4
| * | -Wuninitialized: remove some 'init-self' workaroundsRamsay Jones2018-03-203-4/+4
| |/
* | Merge branch 'tz/complete-tag-delete-tagname'Junio C Hamano2018-03-211-1/+1
|\ \
| * | completion: complete tags with git tag --delete/--verifytz/complete-tag-delete-tagnameTodd Zullinger2018-03-191-1/+1
| |/
* | Merge branch 'ml/filter-branch-portability-fix'Junio C Hamano2018-03-211-3/+3
|\ \
| * | filter-branch: use printf instead of echo -eml/filter-branch-portability-fixMichele Locati2018-03-191-3/+3
* | | Merge branch 'js/ming-strftime'Junio C Hamano2018-03-212-0/+14
|\ \ \
| * | | mingw: abort on invalid strftime formatsjs/ming-strftimeJohannes Schindelin2018-03-192-0/+14
| | |/ | |/|
* | | Merge branch 'dp/merge-strategy-doc-fix'Junio C Hamano2018-03-211-1/+1
|\ \ \
| * | | Documentation/merge-strategies: typofixdp/merge-strategy-doc-fixDavid Pursehouse2018-03-191-1/+1
* | | | Merge branch 'tz/relnotes-1.7-on-perl'Junio C Hamano2018-03-212-1/+16
|\ \ \ \
| * | | | RelNotes: add details on Perl module changestz/relnotes-1.7-on-perlTodd Zullinger2018-03-162-1/+16
* | | | | Merge branch 'rj/http-code-cleanup'Junio C Hamano2018-03-211-1/+3
|\ \ \ \ \
| * | | | | http: fix an unused variable warning for 'curl_no_proxy'rj/http-code-cleanupRamsay Jones2018-03-151-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'ks/t3200-typofix'Junio C Hamano2018-03-211-1/+1
|\ \ \ \ \
| * | | | | t/t3200: fix a typo in a test descriptionks/t3200-typofixKaartic Sivaraam2018-03-151-1/+1
* | | | | | Merge branch 'jt/transfer-fsck-with-promissor'Junio C Hamano2018-03-215-4/+34
|\ \ \ \ \ \
| * | | | | | fetch-pack: do not check links for partial fetchjt/transfer-fsck-with-promissorJonathan Tan2018-03-152-2/+22
| * | | | | | index-pack: support checking objects but not linksJonathan Tan2018-03-153-2/+12
* | | | | | | Merge branch 'bp/refresh-cache-ent-rehash-fix'Junio C Hamano2018-03-211-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix bugs preventing adding updated cache entries to the name hashbp/refresh-cache-ent-rehash-fixBen Peart2018-03-151-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jh/fsck-promisors'Junio C Hamano2018-03-211-3/+5
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: restore OBJECT_INFO_QUICK functionalityjh/fsck-promisorsJonathan Tan2018-03-131-3/+5
* | | | | | | | Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano2018-03-2110-40/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-indexMartin Ågren2018-03-0110-40/+37
* | | | | | | | | Merge branch 'ma/config-page-only-in-list-mode'Junio C Hamano2018-03-214-8/+59
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | config: change default of `pager.config` to "on"ma/config-page-only-in-list-modeMartin Ågren2018-02-213-7/+8
| * | | | | | | | config: respect `pager.config` in list/get-mode onlyMartin Ågren2018-02-214-6/+21
| * | | | | | | | t7006: add tests for how git config paginatesMartin Ågren2018-02-211-7/+42
* | | | | | | | | Git 2.17-rc0v2.17.0-rc0Junio C Hamano2018-03-152-1/+11
* | | | | | | | | Merge branch 'tl/userdiff-csharp-async'Junio C Hamano2018-03-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | userdiff.c: add C# async keyword in diff patterntl/userdiff-csharp-asyncThomas Levesque2018-03-081-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sg/cvs-tests-with-x'Junio C Hamano2018-03-152-9/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9402-git-cvsserver-refs: don't check the stderr of a subshellsg/cvs-tests-with-xSZEDER Gábor2018-03-081-4/+4
| * | | | | | | | | t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'SZEDER Gábor2018-03-081-5/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ab/man-sec-list'Junio C Hamano2018-03-151-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git manpage: note git-security@googlegroups.comab/man-sec-listÆvar Arnfjörð Bjarmason2018-03-081-0/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ab/perl-fixes'Junio C Hamano2018-03-1515-158/+431
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | perl Git::LoadCPAN: emit better errors under NO_PERL_CPAN_FALLBACKSab/perl-fixesÆvar Arnfjörð Bjarmason2018-03-053-5/+44
| * | | | | | | | | Makefile: add NO_PERL_CPAN_FALLBACKS knobTodd Zullinger2018-03-051-0/+8
| * | | | | | | | | perl: move the perl/Git/FromCPAN tree to perl/FromCPANÆvar Arnfjörð Bjarmason2018-03-055-3/+5
| * | | | | | | | | perl: generalize the Git::LoadCPAN facilityÆvar Arnfjörð Bjarmason2018-03-053-58/+82
| * | | | | | | | | perl: move CPAN loader wrappers to another namespaceÆvar Arnfjörð Bjarmason2018-03-055-10/+10
| * | | | | | | | | perl: update our copy of Mail::AddressÆvar Arnfjörð Bjarmason2018-03-051-2/+6
| * | | | | | | | | perl: update our ancient copy of Error.pmÆvar Arnfjörð Bjarmason2018-03-052-41/+255