* [PATCH] doc/config/push: use longer "--" line for preformatted example
@ 2020-02-18 21:25 Jeff King
2020-02-18 21:47 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Jeff King @ 2020-02-18 21:25 UTC (permalink / raw)
To: git; +Cc: Drew DeVault
The example for the push.pushOption config tries to create a
preformatted section, but uses only two dashes in its "--" line. In
AsciiDoc this is an "open block", with no type; the lines end up jumbled
because they're formatted as paragraphs. We need four or more dashes to
make it a "listing block" that will respect the linebreaks.
Signed-off-by: Jeff King <peff@peff.net>
---
I noticed this as part our other discussion. The rendered output of
"./doc-diff HEAD^ HEAD" is:
@@ -4143,15 +4143,20 @@ CONFIGURATION FILE
repository) to clear the values inherited from a lower priority
configuration files (e.g. $HOME/.gitconfig).
- Example:
+ Example:
- /etc/gitconfig push.pushoption = a push.pushoption = b
+ /etc/gitconfig
+ push.pushoption = a
+ push.pushoption = b
- ~/.gitconfig push.pushoption = c
+ ~/.gitconfig
+ push.pushoption = c
- repo/.git/config push.pushoption = push.pushoption = b
+ repo/.git/config
+ push.pushoption =
+ push.pushoption = b
- This will result in only b (a and c are cleared).
+ This will result in only b (a and c are cleared).
push.recurseSubmodules
Make sure all submodule commits used by the revisions to be pushed
Documentation/config/push.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index 54871f8213..0a7aa322a9 100644
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -80,7 +80,7 @@ higher priority configuration file (e.g. `.git/config` in a
repository) to clear the values inherited from a lower priority
configuration files (e.g. `$HOME/.gitconfig`).
+
---
+----
Example:
@@ -97,7 +97,7 @@ repo/.git/config
This will result in only b (a and c are cleared).
---
+----
push.recurseSubmodules::
Make sure all submodule commits used by the revisions to be pushed
--
2.25.1.795.g3fd338b409
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] doc/config/push: use longer "--" line for preformatted example
2020-02-18 21:25 [PATCH] doc/config/push: use longer "--" line for preformatted example Jeff King
@ 2020-02-18 21:47 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2020-02-18 21:47 UTC (permalink / raw)
To: Jeff King; +Cc: git, Drew DeVault
Jeff King <peff@peff.net> writes:
> The example for the push.pushOption config tries to create a
> preformatted section, but uses only two dashes in its "--" line. In
> AsciiDoc this is an "open block", with no type; the lines end up jumbled
> because they're formatted as paragraphs. We need four or more dashes to
> make it a "listing block" that will respect the linebreaks.
And the itemized list in push.default is delimited with two dashes
as a non listing block, so it is shown correctly as a bulletted list
just fine. Makes sense.
Will queue.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-18 21:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-18 21:25 [PATCH] doc/config/push: use longer "--" line for preformatted example Jeff King
2020-02-18 21:47 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).