[PATCH] Fix Documentation/everyday.txt: Junio's workflow
From: Horst H. von Brand <hidden>
Date: 2016-06-15 22:42:28
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The workflow for Junio was badly formatted. Signed-off-by: Horst H. von Brand <redacted> --- Documentation/everyday.txt | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index ffba543..6745ab5 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt@@ -336,15 +336,20 @@ master, nor exposed as a part of a stabl <11> make sure I did not accidentally rewind master beyond what I already pushed out. "ko" shorthand points at the repository I have at kernel.org, and looks like this: - $ cat .git/remotes/ko - URL: kernel.org:/pub/scm/git/git.git - Pull: master:refs/tags/ko-master - Pull: maint:refs/tags/ko-maint - Push: master - Push: +pu - Push: maint ++ +------------ +$ cat .git/remotes/ko +URL: kernel.org:/pub/scm/git/git.git +Pull: master:refs/tags/ko-master +Pull: maint:refs/tags/ko-maint +Push: master +Push: +pu +Push: maint +------------ ++ In the output from "git show-branch", "master" should have everything "ko-master" has. + <12> push out the bleeding edge. <13> push the tag out, too.
@@ -390,7 +395,7 @@ service git port = 9418 socket_type = stream wait = no - user = root + user = nobody server = /usr/bin/git-daemon server_args = --inetd --syslog --export-all --base-path=/pub/scm log_on_failure += USERID
--
1.3.3.g16a4