Junio C Hamano 4ce498baa3 Merge branch 'en/zdiff3' ... "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-15 09:39:47 -08:00
..
.gitignore	…
api-error-handling.txt	…
api-index-skel.txt	…
api-index.sh	…
api-merge.txt	…
api-parse-options.txt	parse-options API: remove OPTION_ARGUMENT feature	2021-09-12 23:27:38 -07:00
api-simple-ipc.txt	…
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	…
chunk-format.txt	…
commit-graph-format.txt	…
commit-graph.txt	…
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	…
long-running-process-protocol.txt	…
multi-pack-index.txt	Merge branch 'jt/midx-doc-fix'	2021-12-10 14:35:13 -08:00
pack-format.txt	…
pack-heuristics.txt	…
pack-protocol.txt	…
packfile-uri.txt	packfile-uri.txt: fix blobPackfileUri description	2021-05-25 09:31:06 +09:00
parallel-checkout.txt	…
partial-clone.txt	Remove warning that repack only works on non-promisor packfiles	2021-06-04 09:45:47 +09:00
protocol-capabilities.txt	…
protocol-common.txt	…
protocol-v2.txt	Merge branch 'cw/protocol-v2-doc-fix'	2021-12-10 14:35:00 -08:00
racy-git.txt	…
reftable.txt	…
remembering-renames.txt	…
repository-version.txt	…
rerere.txt	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
send-pack-pipeline.txt	…
shallow.txt	…
signature-format.txt	signature-format.txt: explain and illustrate multi-line headers	2021-10-12 19:06:24 -07:00
sparse-index.txt	…
trivial-merge.txt	…