diff options
author | Horst H. von Brand <vonbrand@inf.utfsm.cl> | 2006-06-04 22:10:33 -0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-05 12:27:03 -0700 |
commit | 53bcf78a023cee565a31c2956d13dba652f9ccf3 (patch) | |
tree | cb1673cfbfa966a7f2424e89e8b90a71488d24a8 | |
parent | Add example xinetd(8) configuration to Documentation/everyday.txt (diff) | |
download | tgif-53bcf78a023cee565a31c2956d13dba652f9ccf3.tar.xz |
Fix Documentation/everyday.txt: Junio's workflow
The workflow for Junio was badly formatted.
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | Documentation/everyday.txt | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index 7a04f46038..6745ab5fc5 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -336,15 +336,20 @@ master, nor exposed as a part of a stable branch. <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. |