Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jh/trace2-sid-fix' | Junio C Hamano | 2019-05-13 | 1 | -80/+104 |
|\ | |||||
| * | trace2: update docs to describe system/global config settings | Jeff Hostetler | 2019-04-16 | 1 | -67/+84 |
| * | trace2: make SIDs more unique | Jeff Hostetler | 2019-04-16 | 1 | -8/+8 |
| * | trace2: clarify UTC datetime formatting | Jeff Hostetler | 2019-04-16 | 1 | -6/+6 |
| * | trace2: add absolute elapsed time to start event | Jeff Hostetler | 2019-04-16 | 1 | -5/+6 |
| * | trace2: refactor setting process starting time | Jeff Hostetler | 2019-04-16 | 1 | -3/+9 |
* | | Merge branch 'js/trace2-to-directory' | Junio C Hamano | 2019-05-09 | 1 | -0/+5 |
|\ \ | |||||
| * | | trace2: write to directory targets | Josh Steadmon | 2019-03-22 | 1 | -0/+5 |
| |/ | |||||
* | | Merge branch 'js/difftool-no-index' | Junio C Hamano | 2019-04-25 | 1 | -1/+3 |
|\ \ | |||||
| * | | parse-options: make OPT_ARGUMENT() more useful | Johannes Schindelin | 2019-03-18 | 1 | -1/+3 |
| |/ | |||||
* | | Merge branch 'sg/asciidoctor-in-ci' | Junio C Hamano | 2019-04-22 | 2 | -27/+27 |
|\ \ | |||||
| * | | Documentation/technical/protocol-v2.txt: fix formatting | SZEDER Gábor | 2019-04-01 | 1 | -26/+26 |
| * | | Documentation/technical/api-config.txt: fix formatting | SZEDER Gábor | 2019-04-01 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'mh/pack-protocol-doc-fix' | Junio C Hamano | 2019-04-16 | 1 | -4/+4 |
|\ \ | |||||
| * | | fix pack protocol example client/server communication | Mike Hommey | 2019-03-18 | 1 | -4/+4 |
* | | | Merge branch 'ja/dir-rename-doc-markup-fix' | Junio C Hamano | 2019-04-10 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Doc: fix misleading asciidoc formating | Jean-Noël Avila | 2019-03-06 | 1 | -2/+2 |
* | | | Merge branch 'jh/trace2' | Junio C Hamano | 2019-03-07 | 1 | -0/+1349 |
|\ \ \ | |||||
| * | | | trace2: Documentation/technical/api-trace2.txt | Jeff Hostetler | 2019-02-22 | 1 | -0/+1349 |
| | |/ | |/| | |||||
* | | | Merge branch 'js/doc-symref-in-proto-v1' | Junio C Hamano | 2019-03-07 | 1 | -0/+18 |
|\ \ \ | |/ / |/| | | |||||
| * | | protocol-capabilities.txt: document symref | Josh Steadmon | 2019-02-21 | 1 | -0/+18 |
* | | | Merge branch 'ab/commit-graph-write-progress' | Junio C Hamano | 2019-02-05 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | commit-graph: rename "large edges" to "extra edges" | SZEDER Gábor | 2019-01-22 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'jt/fetch-v2-sideband' | Junio C Hamano | 2019-02-05 | 2 | -9/+21 |
|\ \ \ | |||||
| * | | | {fetch,upload}-pack: sideband v2 fetch response | Jonathan Tan | 2019-01-17 | 1 | -0/+10 |
| * | | | pack-protocol.txt: accept error packets in any context | Masaya Suzuki | 2019-01-02 | 1 | -9/+11 |
| |/ / | |||||
* | | | Merge branch 'js/filter-options-should-use-plain-int' | Junio C Hamano | 2019-02-05 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | filter-options: expand scaled numbers | Josh Steadmon | 2019-01-15 | 1 | -1/+7 |
| |/ / | |||||
* | | | Merge branch 'sb/submodule-recursive-fetch-gets-the-tip' | Junio C Hamano | 2019-01-29 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | sha1-array: provide oid_array_filter | Stefan Beller | 2018-12-05 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge branch 'cc/partial-clone-doc-typofix' | Junio C Hamano | 2019-01-29 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | partial-clone: add missing 'is' in doc | Christian Couder | 2019-01-14 | 1 | -1/+1 |
* | | | Merge branch 'nd/doc-extensions' | Junio C Hamano | 2018-11-18 | 1 | -12/+14 |
|\ \ \ | |||||
| * | | | doc: move extensions.worktreeConfig to the right place | Nguyễn Thái Ngọc Duy | 2018-11-16 | 1 | -12/+14 |
* | | | | parse-options: drop OPT_DATE() | Jeff King | 2018-11-06 | 1 | -4/+0 |
|/ / / | |||||
* | | | Merge branch 'bp/read-cache-parallel' | Junio C Hamano | 2018-10-19 | 1 | -0/+41 |
|\ \ \ | |||||
| * | | | ieot: add Index Entry Offset Table (IEOT) extension | Ben Peart | 2018-10-11 | 1 | -0/+18 |
| * | | | eoie: add End of Index Entry (EOIE) extension | Ben Peart | 2018-10-11 | 1 | -0/+23 |
* | | | | Merge branch 'nd/the-index' | Junio C Hamano | 2018-10-19 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | revision.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -2/+2 |
| * | | | | diff.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -2/+2 |
* | | | | | Merge branch 'mw/doc-typofixes' | Junio C Hamano | 2018-10-16 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | docs: graph: remove unnecessary `graph_update()' call | Michael Witten | 2018-10-07 | 1 | -1/+0 |
| * | | | | | docs: typo: s/go/to/ | Michael Witten | 2018-10-07 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'ma/commit-graph-docs' | Junio C Hamano | 2018-10-16 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Doc: refer to the "commit-graph file" with dash | Martin Ågren | 2018-09-27 | 1 | -4/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'ds/commit-graph-with-grafts' | Junio C Hamano | 2018-10-16 | 1 | -3/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | commit-graph: update design document | Derrick Stolee | 2018-08-21 | 1 | -3/+15 |
* | | | | | Merge branch 'tg/rerere-doc-updates' | Junio C Hamano | 2018-09-17 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | rerere: mention caveat about unmatched conflict markers | Thomas Gummerer | 2018-08-29 | 1 | -0/+4 |