Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | transport-helper: die on errors reading refs.sb/check-return-from-read-ref | Stefan Beller | 2015-08-03 | 1 | -2/+6 |
* | Merge branch 'mh/transport-capabilities' | Junio C Hamano | 2015-02-25 | 1 | -12/+13 |
|\ | |||||
| * | transport-helper: ask the helper to set the same options for import as for fetchmh/transport-capabilities | Mike Hommey | 2015-02-13 | 1 | -10/+10 |
| * | transport-helper: ask the helper to set progress and verbosity options after ... | Mike Hommey | 2015-02-13 | 1 | -2/+3 |
* | | Merge branch 'jc/send-email-sensible-encoding' | Junio C Hamano | 2015-02-25 | 1 | -0/+1 |
|\ \ | |||||
| * | | send-email: ask confirmation if given encoding name is very shortjc/send-email-sensible-encoding | Junio C Hamano | 2015-02-13 | 1 | -0/+1 |
* | | | Merge branch 'jk/sanity' | Junio C Hamano | 2015-02-25 | 4 | -9/+42 |
|\ \ \ | |||||
| * | | | test-lib.sh: set prerequisite SANITY by testing what we really need | Torsten Bögershausen | 2015-02-15 | 1 | -3/+22 |
| * | | | tests: correct misuses of POSIXPERM | Junio C Hamano | 2015-01-16 | 2 | -5/+14 |
| * | | | t/lib-httpd: switch SANITY check for NOT_ROOT | Jeff King | 2015-01-16 | 2 | -1/+6 |
* | | | | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' | Junio C Hamano | 2015-02-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | hex.c: reduce memory footprint of sha1_to_hex static bufferssb/hex-object-name-is-at-most-41-bytes-long | Stefan Beller | 2015-02-13 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/fast-import-die-nicely-fix' | Junio C Hamano | 2015-02-25 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | fast-import: avoid running end_packfile recursivelyjk/fast-import-die-nicely-fix | Jeff King | 2015-02-10 | 1 | -1/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'dp/remove-duplicated-header-inclusion' | Junio C Hamano | 2015-02-25 | 4 | -4/+0 |
|\ \ \ \ \ | |||||
| * | | | | | do not include the same header twicedp/remove-duplicated-header-inclusion | Дилян Палаузов | 2015-02-13 | 4 | -4/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jc/max-io-size-and-ssize-max' | Junio C Hamano | 2015-02-25 | 1 | -1/+15 |
|\ \ \ \ \ | |||||
| * | | | | | xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAXjc/max-io-size-and-ssize-max | Junio C Hamano | 2015-02-12 | 1 | -1/+15 |
* | | | | | | Merge branch 'tc/missing-http-proxyauth' | Junio C Hamano | 2015-02-25 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | http: support curl < 7.10.7tc/missing-http-proxyauth | Tom G. Christensen | 2015-02-03 | 1 | -0/+2 |
* | | | | | | | Merge branch 'jk/strbuf-doc-to-header' | Junio C Hamano | 2015-02-25 | 2 | -434/+387 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | strbuf.h: group documentation for trim functionsjk/strbuf-doc-to-header | Jeff King | 2015-01-16 | 1 | -10/+2 |
| * | | | | | | | strbuf.h: drop boilerplate descriptions of strbuf_split_* | Jeff King | 2015-01-16 | 1 | -12/+5 |
| * | | | | | | | strbuf.h: reorganize api function grouping headers | Jeff King | 2015-01-16 | 1 | -9/+8 |
| * | | | | | | | strbuf.h: format asciidoc code blocks as 4-space indent | Jeff King | 2015-01-16 | 1 | -7/+4 |
| * | | | | | | | strbuf.h: drop asciidoc list formatting from API docs | Jeff King | 2015-01-16 | 1 | -37/+37 |
| * | | | | | | | strbuf.h: unify documentation comments beginnings | Stefan Beller | 2015-01-16 | 1 | -7/+7 |
| * | | | | | | | strbuf.h: integrate api-strbuf.txt documentation | Jeff King | 2015-01-16 | 2 | -418/+390 |
* | | | | | | | | Merge branch 'nd/attr-optim' | Junio C Hamano | 2015-02-25 | 1 | -10/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | attr: avoid heavy work when we know the specified attr is not definednd/attr-optim | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -5/+28 |
| * | | | | | | | | attr: do not attempt to expand when we know it's not a macro | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -3/+7 |
| * | | | | | | | | attr.c: rename arg name attr_nr to avoid shadowing the global one | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -3/+3 |
* | | | | | | | | | Merge branch 'jn/doc-api-errors' | Junio C Hamano | 2015-02-25 | 1 | -0/+75 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: document error handling functions and conventions | Jonathan Nieder | 2014-12-04 | 1 | -0/+75 |
* | | | | | | | | | | Sync with 2.3.1 | Junio C Hamano | 2015-02-24 | 3 | -2/+55 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Git 2.3.1v2.3.1 | Junio C Hamano | 2015-02-24 | 4 | -3/+56 |
| * | | | | | | | | | | Merge branch 'ak/add-i-empty-candidates' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 | 2 | -3/+149 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/doc-log-rev-list-options' into maint | Junio C Hamano | 2015-02-24 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/commit-author-no-match-malformed-message' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/dumb-http-idx-fetch-fix' into maint | Junio C Hamano | 2015-02-24 | 2 | -1/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-format-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/status-read-branch-name-fix' into maint | Junio C Hamano | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/push-repo-option-doc' into maint | Junio C Hamano | 2015-02-24 | 1 | -16/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint | Junio C Hamano | 2015-02-24 | 2 | -1/+73 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint | Junio C Hamano | 2015-02-24 | 1 | -10/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/blame-commit-label' into maint | Junio C Hamano | 2015-02-24 | 11 | -34/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #4) | Junio C Hamano | 2015-02-22 | 1 | -0/+28 |