Junio C Hamano baa3b24593 Merge branch 'en/zdiff3' into next ...

"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"

2021-12-07 22:53:23 -08:00

..

.gitignore

…

api-error-handling.txt

api docs: document that BUG() emits a trace2 error event

2021-04-13 14:57:13 -07:00

api-index-skel.txt

…

api-index.sh

…

api-merge.txt

merge: move doc to ll-merge.h

2019-11-18 15:21:28 +09:00

api-parse-options.txt

parse-options API: remove OPTION_ARGUMENT feature

2021-09-12 23:27:38 -07:00

api-simple-ipc.txt

simple-ipc: design documentation for new IPC mechanism

2021-03-15 14:32:50 -07:00

api-trace2.txt

trace2: increment event format version

2021-11-11 15:01:04 -08:00

bitmap-format.txt

Documentation: describe MIDX-based bitmaps

2021-08-24 13:21:13 -07:00

bundle-format.txt

bundle: add new version for use with SHA-256

2020-07-30 09:16:48 -07:00

chunk-format.txt

chunk-format: add technical docs

2021-02-18 13:38:16 -08:00

commit-graph-format.txt

chunk-format: add technical docs

2021-02-18 13:38:16 -08:00

commit-graph.txt

doc: add corrected commit date info

2021-01-18 16:21:18 -08:00

directory-rename-detection.txt

directory-rename-detection.txt: small updates due to merge-ort optimizations

2021-08-05 08:57:39 -07:00

hash-function-transition.txt

*: fix typos which duplicate a word

2021-06-14 10:16:06 +09:00

http-protocol.txt

upload-pack: document and rename --advertise-refs

2021-08-05 08:59:37 -07:00

index-format.txt

sparse-index: add 'sdir' index extension

2021-03-30 12:57:46 -07:00

long-running-process-protocol.txt

Docs: split out long-running subprocess handshake

2018-01-25 11:24:32 -08:00

multi-pack-index.txt

Merge branch 'jt/midx-doc-fix' into next

2021-12-02 13:29:56 -08:00

pack-format.txt

Documentation/technical: describe multi-pack reverse indexes

2021-04-01 13:07:37 -07:00

pack-heuristics.txt

…

pack-protocol.txt

Merge branch 'jx/proc-receive-hook'

2020-09-25 15:25:39 -07:00

packfile-uri.txt

packfile-uri.txt: fix blobPackfileUri description

2021-05-25 09:31:06 +09:00

parallel-checkout.txt

parallel-checkout: add design documentation

2021-04-19 15:05:25 -07:00

partial-clone.txt

Remove warning that repack only works on non-promisor packfiles

2021-06-04 09:45:47 +09:00

protocol-capabilities.txt

docs: new capability to advertise session IDs

2020-11-11 18:26:52 -08:00

protocol-common.txt

…

protocol-v2.txt

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

2021-12-02 13:29:42 -08:00

racy-git.txt

doc: replace LKML link with lore.kernel.org

2019-12-04 10:26:52 -08:00

reftable.txt

reftable: document an alternate cleanup method on Windows

2021-04-12 14:29:44 -07:00

remembering-renames.txt

t6429: testcases for remembering renames

2021-05-20 15:40:39 +09:00

repository-version.txt

doc: move extensions.worktreeConfig to the right place

2018-11-16 14:10:31 +09:00

rerere.txt

update documentation for new zdiff3 conflictStyle

2021-12-01 14:45:59 -08:00

send-pack-pipeline.txt

…

shallow.txt

shallow.txt: document SHA-256 shallow format

2020-08-17 10:35:13 -07:00

signature-format.txt

signature-format.txt: explain and illustrate multi-line headers

2021-10-12 19:06:24 -07:00

sparse-index.txt

sparse-index: API protection strategy

2021-04-14 13:45:34 -07:00

trivial-merge.txt

treewide: correct several "up-to-date" to "up to date"

2017-08-23 12:17:22 -07:00