summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* daemon: unbreak NO_IPV6 build regressionjc/daemon-no-ipv6-for-2.4.1Junio C Hamano2015-05-051-1/+1
* daemon: deglobalize hostname informationrs/daemon-hostname-in-strbufRené Scharfe2015-03-091-59/+74
* daemon: use strbuf for hostname infoRené Scharfe2015-03-091-57/+41
* Merge branch 'jk/daemon-interpolate'Junio C Hamano2015-03-033-6/+83
|\
| * daemon: sanitize incoming virtual hostnamejk/daemon-interpolateJeff King2015-02-172-5/+56
| * t5570: test git-daemon's --interpolated-path optionJeff King2015-02-171-0/+16
| * git_connect: let user override virtual-host we send to daemonJeff King2015-02-171-1/+11
* | Merge branch 'rs/daemon-interpolate'Junio C Hamano2015-03-031-15/+72
|\ \
| * | daemon: use callback to build interpolated pathrs/daemon-interpolateRené Scharfe2015-02-171-9/+45
| * | daemon: look up client-supplied hostname lazilyRené Scharfe2015-02-171-8/+29
| |/
* | Merge branch 'km/send-email-getopt-long-workarounds'Junio C Hamano2015-03-032-5/+15
|\ \
| * | git-send-email.perl: support no- prefix with older GetOptionskm/send-email-getopt-long-workaroundsKyle J. McKay2015-02-162-5/+15
* | | Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano2015-03-031-0/+3
|\ \ \
| * | | apply: detect and mark whitespace errors in context lines when fixingjc/apply-ws-fix-expands-reportJunio C Hamano2015-01-221-0/+3
* | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-034-2/+399
|\ \ \ \
| * | | | apply: do not touch a file beyond a symbolic linkjc/apply-beyond-symlinkJunio C Hamano2015-02-103-4/+203
| * | | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-102-0/+21
| * | | | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-101-1/+1
| * | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-103-1/+178
* | | | | Post 2.3 cyle (batch #5)Junio C Hamano2015-02-251-0/+53
* | | | | Merge branch 'ak/git-pm-typofix'Junio C Hamano2015-02-251-2/+2
|\ \ \ \ \
| * | | | | Git.pm: two minor typo fixesak/git-pm-typofixAlexander Kuleshov2015-02-181-2/+2
* | | | | | Merge branch 'sb/plug-leak-in-make-cache-entry'Junio C Hamano2015-02-251-2/+8
|\ \ \ \ \ \
| * | | | | | read-cache.c: free cache entry when refreshing failssb/plug-leak-in-make-cache-entryStefan Beller2015-02-171-2/+8
* | | | | | | Merge branch 'mh/transport-capabilities'Junio C Hamano2015-02-251-12/+13
|\ \ \ \ \ \ \
| * | | | | | | transport-helper: ask the helper to set the same options for import as for fetchmh/transport-capabilitiesMike Hommey2015-02-131-10/+10
| * | | | | | | transport-helper: ask the helper to set progress and verbosity options after ...Mike Hommey2015-02-131-2/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jc/send-email-sensible-encoding'Junio C Hamano2015-02-251-0/+1
|\ \ \ \ \ \ \
| * | | | | | | send-email: ask confirmation if given encoding name is very shortjc/send-email-sensible-encodingJunio C Hamano2015-02-131-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/sanity'Junio C Hamano2015-02-254-9/+42
|\ \ \ \ \ \ \
| * | | | | | | test-lib.sh: set prerequisite SANITY by testing what we really needTorsten Bögershausen2015-02-151-3/+22
| * | | | | | | tests: correct misuses of POSIXPERMJunio C Hamano2015-01-162-5/+14
| * | | | | | | t/lib-httpd: switch SANITY check for NOT_ROOTJeff King2015-01-162-1/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long'Junio C Hamano2015-02-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | hex.c: reduce memory footprint of sha1_to_hex static bufferssb/hex-object-name-is-at-most-41-bytes-longStefan Beller2015-02-131-1/+1
* | | | | | | | Merge branch 'jk/fast-import-die-nicely-fix'Junio C Hamano2015-02-251-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import: avoid running end_packfile recursivelyjk/fast-import-die-nicely-fixJeff King2015-02-101-1/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dp/remove-duplicated-header-inclusion'Junio C Hamano2015-02-254-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | do not include the same header twicedp/remove-duplicated-header-inclusionДилян Палаузов2015-02-134-4/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/max-io-size-and-ssize-max'Junio C Hamano2015-02-251-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAXjc/max-io-size-and-ssize-maxJunio C Hamano2015-02-121-1/+15
* | | | | | | | | Merge branch 'tc/missing-http-proxyauth'Junio C Hamano2015-02-251-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: support curl < 7.10.7tc/missing-http-proxyauthTom G. Christensen2015-02-031-0/+2
* | | | | | | | | | Merge branch 'jk/strbuf-doc-to-header'Junio C Hamano2015-02-252-434/+387
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | strbuf.h: group documentation for trim functionsjk/strbuf-doc-to-headerJeff King2015-01-161-10/+2
| * | | | | | | | | | strbuf.h: drop boilerplate descriptions of strbuf_split_*Jeff King2015-01-161-12/+5
| * | | | | | | | | | strbuf.h: reorganize api function grouping headersJeff King2015-01-161-9/+8
| * | | | | | | | | | strbuf.h: format asciidoc code blocks as 4-space indentJeff King2015-01-161-7/+4
| * | | | | | | | | | strbuf.h: drop asciidoc list formatting from API docsJeff King2015-01-161-37/+37
| * | | | | | | | | | strbuf.h: unify documentation comments beginningsStefan Beller2015-01-161-7/+7