git/Documentation/technical, branch v2.19.2

Merge branch 'mw/doc-typofixes' into maint

2018-11-21T13:58:03Z

Typofixes. * mw/doc-typofixes: docs: typo: s/isimilar/similar/ docs: graph: remove unnecessary `graph_update()' call docs: typo: s/go/to/

Merge branch 'ma/commit-graph-docs' into maint

2018-11-21T13:58:00Z

Doc update. * ma/commit-graph-docs: Doc: refer to the "commit-graph file" with dash git-commit-graph.txt: refer to "*commit*-graph file" git-commit-graph.txt: typeset more in monospace git-commit-graph.txt: fix bullet lists

Merge branch 'ds/commit-graph-with-grafts' into maint

2018-11-21T13:57:47Z

The recently introduced commit-graph auxiliary data is incompatible with mechanisms such as replace & grafts that "breaks" immutable nature of the object reference relationship. Disable optimizations based on its use (and updating existing commit-graph) when these incompatible features are in use in the repository. * ds/commit-graph-with-grafts: commit-graph: close_commit_graph before shallow walk commit-graph: not compatible with uninitialized repo commit-graph: not compatible with grafts commit-graph: not compatible with replace objects test-repository: properly init repo commit-graph: update design document refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback refs.c: migrate internal ref iteration to pass thru repository argument

docs: graph: remove unnecessary `graph_update()' call

2018-10-07T01:10:49Z

The sample code calls `get_revision()' followed by `graph_update()', but the documentation and source code indicate that `get_revision()' already calls `graph_update()' for you. Signed-off-by: Michael Witten Signed-off-by: Junio C Hamano

docs: typo: s/go/to/

2018-10-07T01:10:42Z

Signed-off-by: Michael Witten Signed-off-by: Junio C Hamano

Doc: refer to the "commit-graph file" with dash

2018-09-27T22:29:12Z

The file processed by `git commit-graph` is referred to as the "commit-graph file", also with a dash. We have a few references to the "commit graph file", though, without the dash. These occur in git-commit-graph.txt as well as in Doc/technical/commit-graph.txt. Fix them. Do not change the references to the "commit graph" (without "... file") as a data structure. Signed-off-by: Martin Ågren Reviewed-by: Derrick Stolee Signed-off-by: Junio C Hamano

commit-graph: update design document

2018-08-21T17:22:50Z

As it exists right now, the commit-graph feature may provide inconsistent results when combined with commit grafts, replace objects, and shallow clones. Update the design document to discuss why these interactions are difficult to reconcile and how we will avoid errors by preventing updates to and reads from the commit-graph file when these other features exist. Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

Merge branch 'jh/partial-clone-doc'

2018-08-20T18:33:55Z

Doc updates. * jh/partial-clone-doc: partial-clone: render design doc using asciidoc

Merge branch 'ab/newhash-is-sha256'

2018-08-20T18:33:48Z

Documentation update. * ab/newhash-is-sha256: doc hash-function-transition: pick SHA-256 as NewHash doc hash-function-transition: note the lack of a changelog

Merge branch 'ms/http-proto-doc'

2018-08-15T22:08:27Z

Doc fix. * ms/http-proto-doc: doc: fix want-capability separator