git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] Documentation: fix git-config.xml generation

From
James Bowes <jbowes@dangerouslyinc.com>
Date
May 23, 2007, 22:16 UTC
Message-ID
<3f80363f0705231516x7c6fa2daua33a708deaa7a10c@mail.gmail.com>
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
---

With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to validate. This patch just makes the asciidoc formatting for branch.autosetupmerge the same as the other config options.

 Documentation/config.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index eb2e79a..14aa3bd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -281,11 +281,11 @@ apply.whitespace::
 	as the '--whitespace' option. See gitlink:git-apply[1].

 branch.autosetupmerge::
-	Tells `git-branch' and `git-checkout' to setup new branches
+	Tells `git-branch` and `git-checkout` to setup new branches
 	so that gitlink:git-pull[1] will appropriately merge from that
 	remote branch.  Note that even if this option is not set,
-	this behavior can be chosen per-branch using the `--track`
-	and `--no-track` options.  This option defaults to false.
+	this behavior can be chosen per-branch using the '--track'
+	and '--no-track' options.  This option defaults to false.

 branch.<name>.remote::
 	When in branch <name>, it tells `git fetch` which remote to fetch.
-- 
1.5.2.762.gd8c6
Next: Jeffrey C. Ollie
Message 1 of 6 in “Documentation: fix git-config.xml generation”
  1. Documentation: fix git-config.xml generationJames Bowes, May 23, 2007
  2. Jeffrey C. OllieMay 24, 2007
  3. Junio C HamanoMay 24, 2007
  4. Jeffrey C. OllieMay 24, 2007
  5. Shawn O. PearceMay 24, 2007
  6. Jeffrey C. OllieMay 24, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.