git/Documentation/technical, branch v2.35.2

Merge branch 'en/zdiff3'

2021-12-15T17:39:47Z

"Zealous diff3" style of merge conflict presentation has been added. * en/zdiff3: update documentation for new zdiff3 conflictStyle xdiff: implement a zealous diff3, or "zdiff3"

Merge branch 'jt/midx-doc-fix'

2021-12-10T22:35:13Z

Docfix. * jt/midx-doc-fix: Doc: no midx and partial clone relation

Merge branch 'tl/midx-docfix'

2021-12-10T22:35:11Z

Doc mark-up fix. * tl/midx-docfix: midx: fix a formatting issue in "multi-pack-index.txt"

Merge branch 'cw/protocol-v2-doc-fix'

2021-12-10T22:35:00Z

Doc update. * cw/protocol-v2-doc-fix: protocol-v2.txt: align delim-pkt spec with usage

update documentation for new zdiff3 conflictStyle

2021-12-01T22:45:59Z

Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

Doc: no midx and partial clone relation

2021-11-22T20:46:33Z

The multi-pack index treats promisor packfiles (that is, packfiles that have an accompanying .promisor file) the same as other packfiles. Remove a section in the documentation that seems to indicate otherwise. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

midx: fix a formatting issue in "multi-pack-index.txt"

2021-11-18T19:31:07Z

There is a formatting issue in "multi-pack-index.html", corresponding to the nesting bulleted list of a wrong usage in "multi-pack-index.txt" and this commit fix the problem. In ASCIIDOC, it doesn't treat an indented character as the beginning of a sub-list. If we want to write a nested bulleted list, we could just use ASTERISK without any DASH like: " * Level 1 list item ** Level 2 list item *** Level 3 list item ** Level 2 list item * Level 1 list item ** Level 2 list item * Level 1 list item " The DASH can be used for bulleted list too, But the DASH is suggested only to be used as the marker for the first level because the DASH doesn’t work well or a best practice for nested lists, like (dash is as level 2 below): " * Level 1 list item - Level 2 list item * Level 1 list item " ASTERISK is recommanded to use because it works intuitively and clearly ("marker length = nesting level") in nested lists, but the DASH can't. However, when you want to write a non-nested bulleted lists, DASH works too, like: " - Level 1 list item - Level 1 list item - Level 1 list item " Reviewed-by: Taylor Blau Reviewed-by: Derrick Stolee Signed-off-by: Teng Long Signed-off-by: Junio C Hamano

Merge branch 'js/trace2-raise-format-version'

2021-11-12T23:29:25Z

When we added a new event type to trace2 event stream, we forgot to raise the format version number, which has been corrected. * js/trace2-raise-format-version: trace2: increment event format version

trace2: increment event format version

2021-11-11T23:01:04Z

In 64bc752 (trace2: add trace2_child_ready() to report on background children, 2021-09-20), we added a new "child_ready" event. In Documentation/technical/api-trace2.txt, we promise that adding a new event type will result in incrementing the trace2 event format version number, but this was not done. Correct this in code & docs. Signed-off-by: Josh Steadmon Signed-off-by: Junio C Hamano

protocol-v2.txt: align delim-pkt spec with usage

2021-11-11T22:53:18Z

The current protocol EBNF allows command-request to end with the capability list, if no command specific arguments follow, but the protocol requires that after the capability list, there must be a delim-pkt regardless of the number of command specific arguments. Fixed the EBNF to match. Both JGit and libgit2's implementation has the delim-pkt as mandatory. JGit's code is not publicly linkable, but libgit2 is linked below[1]. As for currently implemented commands on v2 (ls-ref and fetch), the delim packet is already being passed through [1]: https://github.com/libgit2/libgit2/blob/main/src/transports/git.c Reported-by: Ivan Frade Signed-off-by: Calvin Wan Signed-off-by: Junio C Hamano