Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-16 | 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-28 | 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 |
* | | | | | Merge branch 'tg/rerere' | Junio C Hamano | 2018-09-17 | 1 | -0/+182 |
|\| | | | | |||||
| * | | | | rerere: teach rerere to handle nested conflicts | Thomas Gummerer | 2018-08-06 | 1 | -0/+42 |
| * | | | | rerere: add documentation for conflict normalization | Thomas Gummerer | 2018-08-06 | 1 | -0/+140 |
* | | | | | Sync 'ds/multi-pack-index' to v2.19.0-rc0 | Junio C Hamano | 2018-08-21 | 2 | -0/+186 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | midx: write object offsets | Derrick Stolee | 2018-07-20 | 1 | -1/+14 |
| * | | | | midx: write object id fanout chunk | Derrick Stolee | 2018-07-20 | 1 | -0/+5 |
| * | | | | midx: write object ids in a chunk | Derrick Stolee | 2018-07-20 | 1 | -0/+4 |
| * | | | | multi-pack-index: write pack names in chunk | Derrick Stolee | 2018-07-20 | 1 | -0/+6 |
| * | | | | multi-pack-index: add format details | Derrick Stolee | 2018-07-12 | 1 | -0/+49 |
| * | | | | multi-pack-index: add design document | Derrick Stolee | 2018-07-12 | 1 | -0/+109 |
* | | | | | Merge branch 'jh/partial-clone-doc' | Junio C Hamano | 2018-08-20 | 1 | -104/+104 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | partial-clone: render design doc using asciidoc | Jonathan Nieder | 2018-08-15 | 1 | -104/+104 |
* | | | | | Merge branch 'ab/newhash-is-sha256' | Junio C Hamano | 2018-08-20 | 1 | -98/+104 |
|\ \ \ \ \ | |||||
| * | | | | | doc hash-function-transition: pick SHA-256 as NewHash | Jonathan Nieder | 2018-08-07 | 1 | -98/+98 |
| * | | | | | doc hash-function-transition: note the lack of a changelog | Ævar Arnfjörð Bjarmason | 2018-07-25 | 1 | -0/+6 |
* | | | | | | Merge branch 'ms/http-proto-doc' | Junio C Hamano | 2018-08-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | doc: fix want-capability separator | Masaya Suzuki | 2018-07-30 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'bw/protocol-v2' | Junio C Hamano | 2018-08-16 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | pack-protocol: mention and point to docs for protocol v2 | Brandon Williams | 2018-07-24 | 1 | -1/+2 |
* | | | | | | Merge branch 'ds/commit-graph-fsck' | Junio C Hamano | 2018-08-03 | 1 | -22/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | commit-graph: update design document | Derrick Stolee | 2018-06-27 | 1 | -22/+0 |
| | |_|_|/ | |/| | | |