From 69ad100e7ef5c17e84d98d075917a37bb4c3fe6f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 11 Nov 2016 10:33:32 +0100 Subject: [PATCH] fixup! asciidoctor: Fix `giteveryday.txt` to be built with asciidoctor. --- Documentation/giteveryday.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt index bd57ea2c1a..35473ad02f 100644 --- a/Documentation/giteveryday.txt +++ b/Documentation/giteveryday.txt @@ -308,15 +308,18 @@ 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) + -{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++ +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 +------------ + <12> In the output from `git show-branch`, `master` should have everything `ko/master` has, and `next` should have