From 8bdcd013e1803fdda0f4047eaa0dc687686b4c3f Mon Sep 17 00:00:00 2001 From: nalla Date: Wed, 15 Apr 2015 08:01:07 +0100 Subject: [PATCH] asciidoctor: Fix `giteveryday.txt` to be built with asciidoctor. When building the `doc` with `asciidoctor`, `asciidoctor` complains about a nested code block in a callout list. This is a really dirty solution to restore the callout list to function properly. There is a minimal visual sideeffect; the *immitated* codeblock has no overall greyish background. Instead the individual lines have it. Note: When building this patch with `asciidoc` the background is totally gone but the font is still monospaced. Signed-off-by: nalla --- Documentation/giteveryday.txt | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt index 35473ad02f..bd57ea2c1a 100644 --- a/Documentation/giteveryday.txt +++ b/Documentation/giteveryday.txt @@ -308,18 +308,15 @@ master or exposed as a part of a stable branch. <10> create a signed tag. <11> make sure master was not accidentally rewound beyond that already pushed out. `ko` shorthand points at the Git maintainer's -repository at kernel.org, and looks like this: -+ ------------- -(in .git/config) -[remote "ko"] - url = kernel.org:/pub/scm/git/git.git - fetch = refs/heads/*:refs/remotes/ko/* - push = refs/heads/master - push = refs/heads/next - push = +refs/heads/pu - push = refs/heads/maint ------------- +repository at kernel.org, and looks like this: + +++(in .git/config) + +{startsb}remote "ko"{endsb} + +{nbsp}{nbsp}{nbsp}{nbsp}url = kernel.org:/pub/scm/git/git.git + +{nbsp}{nbsp}{nbsp}{nbsp}fetch = refs/heads/\*:refs/remotes/ko/* + +{nbsp}{nbsp}{nbsp}{nbsp}push = refs/heads/master + +{nbsp}{nbsp}{nbsp}{nbsp}push = refs/heads/next + +{nbsp}{nbsp}{nbsp}{nbsp}push = +refs/heads/pu + +{nbsp}{nbsp}{nbsp}{nbsp}push = refs/heads/maint++ + <12> In the output from `git show-branch`, `master` should have everything `ko/master` has, and `next` should have