Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | 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-20 | 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-15 | 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-15 | 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-02 | 1 | -22/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | commit-graph: update design document | Derrick Stolee | 2018-06-27 | 1 | -22/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jt/partial-clone-fsck-connectivity' | Junio C Hamano | 2018-07-24 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | upload-pack: send refs' objects despite "filter" | Jonathan Tan | 2018-07-09 | 1 | -1/+3 |
* | | | | | | Merge branch 'jt/connectivity-check-after-unshallow' | Junio C Hamano | 2018-07-24 | 1 | -1/+27 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | upload-pack: implement ref-in-want | Brandon Williams | 2018-06-28 | 1 | -1/+27 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'en/rebase-consistency' | Junio C Hamano | 2018-07-24 | 1 | -0/+115 |
|\ \ \ \ \ | |||||
| * | | | | | git-rebase.txt: document behavioral differences between modes | Elijah Newren | 2018-06-27 | 1 | -0/+23 |
| * | | | | | directory-rename-detection.txt: technical docs on abilities and limitations | Elijah Newren | 2018-06-27 | 1 | -0/+92 |
| |/ / / / | |||||
* | | | | | Merge branch 'ds/commit-graph' | Junio C Hamano | 2018-07-18 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | commit-graph: fix documentation inconsistencies | Derrick Stolee | 2018-06-28 | 1 | -5/+5 |
* | | | | | | Merge branch 'vs/typofixes' | Junio C Hamano | 2018-07-18 | 3 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: spelling and grammar fixes | Ville Skyttä | 2018-06-22 | 3 | -3/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'bw/protocol-v2' | Junio C Hamano | 2018-07-18 | 1 | -2/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | protocol-v2 doc: put HTTP headers after request | Josh Steadmon | 2018-06-22 | 1 | -2/+1 |
* | | | | | Merge branch 'ds/commit-graph-lockfile-fix' | Junio C Hamano | 2018-06-25 | 1 | -5/+24 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | commit-graph.txt: update design document | Derrick Stolee | 2018-05-22 | 1 | -5/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ab/get-short-oid' | Junio C Hamano | 2018-05-30 | 1 | -6/+11 |
|\ \ \ \ | |||||
| * | | | | get_short_oid: sort ambiguous objects by type, then SHA-1 | Ævar Arnfjörð Bjarmason | 2018-05-11 | 1 | -6/+11 |
* | | | | | Merge branch 'jt/partial-clone-proto-v2' | Junio C Hamano | 2018-05-30 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | {fetch,upload}-pack: support filter in protocol v2 | Jonathan Tan | 2018-05-06 | 1 | -0/+9 |
| * | | | | | Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2 | Junio C Hamano | 2018-05-02 | 1 | -0/+395 |
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | |