summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* transport-helper: die on errors reading refs.sb/check-return-from-read-refStefan Beller2015-08-031-2/+6
* 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
| * | | | | | | strbuf.h: integrate api-strbuf.txt documentationJeff King2015-01-162-418/+390
* | | | | | | | Merge branch 'nd/attr-optim'Junio C Hamano2015-02-251-10/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | attr: avoid heavy work when we know the specified attr is not definednd/attr-optimNguyễn Thái Ngọc Duy2014-12-291-5/+28
| * | | | | | | | attr: do not attempt to expand when we know it's not a macroNguyễn Thái Ngọc Duy2014-12-291-3/+7
| * | | | | | | | attr.c: rename arg name attr_nr to avoid shadowing the global oneNguyễn Thái Ngọc Duy2014-12-291-3/+3
* | | | | | | | | Merge branch 'jn/doc-api-errors'Junio C Hamano2015-02-251-0/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: document error handling functions and conventionsJonathan Nieder2014-12-041-0/+75
* | | | | | | | | | Sync with 2.3.1Junio C Hamano2015-02-243-2/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git 2.3.1v2.3.1Junio C Hamano2015-02-244-3/+56
| * | | | | | | | | | Merge branch 'ak/add-i-empty-candidates' into maintJunio C Hamano2015-02-241-0/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-242-3/+149
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-log-rev-list-options' into maintJunio C Hamano2015-02-241-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/dumb-http-idx-fetch-fix' into maintJunio C Hamano2015-02-242-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-format-doc' into maintJunio C Hamano2015-02-241-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/status-read-branch-name-fix' into maintJunio C Hamano2015-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/push-repo-option-doc' into maintJunio C Hamano2015-02-241-16/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maintJunio C Hamano2015-02-241-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2015-02-242-1/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano2015-02-241-10/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-2411-34/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #4)Junio C Hamano2015-02-221-0/+28