Re: [PATCH v2 2/4] doc: add an UPSTREAM BRANCHES section to pull/push/fetch
From: Junio C Hamano <hidden>
Date: 2025-09-16 05:25:54
"Julia Evans via GitGitGadget" [off-list ref] writes:
quoted hunk
diff --git a/Documentation/urls-remotes.adoc b/Documentation/urls-remotes-upstreams.adoc similarity index 63% rename from Documentation/urls-remotes.adoc rename to Documentation/urls-remotes-upstreams.adoc index 9b10151198..1e9c56dc5f 100644 --- a/Documentation/urls-remotes.adoc +++ b/Documentation/urls-remotes-upstreams.adoc@@ -91,6 +91,41 @@ git push uses:... +The upstream is stored in `.git/config`, in the "remote" and "merge" +fields. For example, if `main`'s upstream is `origin/main`: + +``` +[branch "main"] + remote = origin + merge = refs/heads/main +```
When running with AsciiDoc, this makes the build fail with
ASCIIDOC git-fetch.html
asciidoc: ERROR: urls-remotes-upstreams.adoc: line 111: illegal style name: branch "main"
gmake: *** [Makefile:356: git-fetch.html] Error 1
The line #111 is the one that has [branch "main"] on it.
Curiously, USE_ASCIIDOCTOR=YesPlease would not suffer from the
issue.
cf. https://github.com/git/git/actions/runs/17743739238/job/50423820029#step:4:1395