summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | receive-pack: implement advertising and receiving push optionsStefan Beller2016-07-144-6/+52
| * | | | | | | | push options: {pre,post}-receive hook learns about push optionsStefan Beller2016-07-143-13/+76
* | | | | | | | | Merge branch 'ew/http-walker'Junio C Hamano2016-08-033-31/+206
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | list: avoid incompatibility with *BSD sys/queue.hew/http-walkerEric Wong2016-07-181-0/+2
| * | | | | | | | | http-walker: reduce O(n) ops with doubly-linked listEric Wong2016-07-122-27/+179
| * | | | | | | | | http: avoid disconnecting on 404s for loose objectsEric Wong2016-07-122-2/+23
| * | | | | | | | | http-walker: remove unused parameter from fetch_objectEric Wong2016-07-121-2/+2
* | | | | | | | | | Merge branch 'pm/build-persistent-https-with-recent-go'Junio C Hamano2016-08-031-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | contrib/persistent-https: use Git version for build labelpm/build-persistent-https-with-recent-goParker Moore2016-07-221-1/+1
| * | | | | | | | | | contrib/persistent-https: update ldflags syntax for Go 1.7+Parker Moore2016-07-221-1/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'da/subtree-2.9-regression'Junio C Hamano2016-08-032-8/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | subtree: fix "git subtree split --rejoin"da/subtree-2.9-regressionDavid Aguilar2016-07-262-0/+17
| * | | | | | | | | | t7900-subtree.sh: fix quoting and broken && chainsDavid Aguilar2016-07-261-8/+8
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'os/no-verify-skips-commit-msg-too'Junio C Hamano2016-08-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: describe that --no-verify skips the commit-msg hook in the help textos/no-verify-skips-commit-msg-tooOrgad Shaneh2016-07-261-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Sync with maintJunio C Hamano2016-07-281-0/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Some fixes for 2.9.3fbsd-lazy-mtimeJunio C Hamano2016-07-282-1/+59
| * | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2016-07-281-1/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/icase' into maintJunio C Hamano2016-07-2811-21/+291
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-parallel-fetch' into maintJunio C Hamano2016-07-281-16/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-281-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-match-signal' into maintJunio C Hamano2016-07-283-11/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-281-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t3404-grammo-fix' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/doc-new-command' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/color-on-windows-comment' into maintJunio C Hamano2016-07-281-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-2862-227/+228
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/sign-empty-commit-fix' into maintJunio C Hamano2016-07-281-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintJunio C Hamano2016-07-282-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-282-3/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-287-15/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dg/subtree-rebase-test' into maintJunio C Hamano2016-07-281-0/+119
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch of topics for 2.10Junio C Hamano2016-07-281-19/+34
* | | | | | | | | | | | | | | | | | | | | | | | | | | t9100: portability fixJunio C Hamano2016-07-281-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svnJunio C Hamano2016-07-283-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: allow --version to work anywhereEric Wong2016-07-222-2/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: document svn.authorsProg in configEric Wong2016-07-191-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-deinit-all'Junio C Hamano2016-07-281-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule deinit: remove outdated commentsb/submodule-deinit-allStefan Beller2016-07-261-2/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/find-perl-on-freebsd-in-local'Junio C Hamano2016-07-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: correct perl path on FreeBSDew/find-perl-on-freebsd-in-localNguyễn Thái Ngọc Duy2016-07-261-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/daemon-socket-keepalive'Junio C Hamano2016-07-282-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: add missing definition of ENOTSOCKew/daemon-socket-keepaliveJohannes Sixt2016-07-221-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemon: ignore ENOTSOCK from setsockoptEric Wong2016-07-181-3/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit'Junio C Hamano2016-07-289-29/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limitNguyễn Thái Ngọc Duy2016-07-134-6/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pack-objects: do not truncate result in-pack object size on 32-bit systemsNguyễn Thái Ngọc Duy2016-07-131-7/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: correct "offset" type in unpack_entry_data()Nguyễn Thái Ngọc Duy2016-07-131-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: report correct bad object offsets even if they are largeNguyễn Thái Ngọc Duy2016-07-131-3/+4