Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Fix Documentation/everyday.txt: Junio's workflow
author
Horst H. von Brand
<vonbrand@inf.utfsm.cl>
Mon, 5 Jun 2006 02:10:33 +0000
(22:10 -0400)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 5 Jun 2006 19:27:03 +0000
(12:27 -0700)
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>
Documentation/everyday.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c51901d
)
diff --git
a/Documentation/everyday.txt
b/Documentation/everyday.txt
index 7a04f460382da0ffe2aa52cda2b60433fb0408e2..6745ab5fc5a1f1262edb9e2563627831b4b7f4bd 100644
(file)
--- 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:
<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.
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.
<12> push out the bleeding edge.
<13> push the tag out, too.