From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Aug 2022 20:07:04 +0000 (-0700)
Subject: Merge branch 'ds/bundle-uri-more'
X-Git-Tag: v2.38.0-rc0~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d133a3dcf43eb0396a5899008a4ff4ceaeb0d6e;p=thirdparty%2Fgit.git

Merge branch 'ds/bundle-uri-more'

The "bundle URI" design gets documented.

* ds/bundle-uri-more:
  bundle-uri: add example bundle organization
  docs: document bundle URI standard
---

0d133a3dcf43eb0396a5899008a4ff4ceaeb0d6e
diff --cc Documentation/Makefile
index 346bbcf8be,20a7861e82..bd6b6fcb93
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -104,14 -93,21 +104,15 @@@ SP_ARTICLES += $(API_DOCS
  TECH_DOCS += MyFirstContribution
  TECH_DOCS += MyFirstObjectWalk
  TECH_DOCS += SubmittingPatches
 -TECH_DOCS += technical/bundle-format
 +TECH_DOCS += ToolsForGit
 +TECH_DOCS += technical/bitmap-format
+ TECH_DOCS += technical/bundle-uri
  TECH_DOCS += technical/hash-function-transition
 -TECH_DOCS += technical/http-protocol
 -TECH_DOCS += technical/index-format
  TECH_DOCS += technical/long-running-process-protocol
  TECH_DOCS += technical/multi-pack-index
 -TECH_DOCS += technical/pack-format
  TECH_DOCS += technical/pack-heuristics
 -TECH_DOCS += technical/pack-protocol
  TECH_DOCS += technical/parallel-checkout
  TECH_DOCS += technical/partial-clone
 -TECH_DOCS += technical/protocol-capabilities
 -TECH_DOCS += technical/protocol-common
 -TECH_DOCS += technical/protocol-v2
  TECH_DOCS += technical/racy-git
  TECH_DOCS += technical/reftable
  TECH_DOCS += technical/send-pack-pipeline