Skip to content

Commit 53bcf78

Browse files
vonbrandJunio C Hamano
authored andcommitted
Fix Documentation/everyday.txt: Junio's workflow
The workflow for Junio was badly formatted. Signed-off-by: Horst H. von Brand <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c51901d commit 53bcf78

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Documentation/everyday.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,20 @@ master, nor exposed as a part of a stable branch.
336336
<11> make sure I did not accidentally rewind master beyond what I
337337
already pushed out. "ko" shorthand points at the repository I have
338338
at kernel.org, and looks like this:
339-
$ cat .git/remotes/ko
340-
URL: kernel.org:/pub/scm/git/git.git
341-
Pull: master:refs/tags/ko-master
342-
Pull: maint:refs/tags/ko-maint
343-
Push: master
344-
Push: +pu
345-
Push: maint
339+
+
340+
------------
341+
$ cat .git/remotes/ko
342+
URL: kernel.org:/pub/scm/git/git.git
343+
Pull: master:refs/tags/ko-master
344+
Pull: maint:refs/tags/ko-maint
345+
Push: master
346+
Push: +pu
347+
Push: maint
348+
------------
349+
+
346350
In the output from "git show-branch", "master" should have
347351
everything "ko-master" has.
352+
348353
<12> push out the bleeding edge.
349354
<13> push the tag out, too.
350355

0 commit comments

Comments
 (0)