Author: buildbot
Date: Sun May 4 07:45:14 2014
New Revision: 907981
Log:
Staging update by buildbot for deltaspike
Modified:
websites/staging/deltaspike/trunk/content/ (props changed)
websites/staging/deltaspike/trunk/content/steps_for_a_release.html
Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun May 4 07:45:14 2014
@@ -1 +1 @@
-1592313
+1592314
Modified: websites/staging/deltaspike/trunk/content/steps_for_a_release.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/steps_for_a_release.html
(original)
+++ websites/staging/deltaspike/trunk/content/steps_for_a_release.html Sun May
4 07:45:14 2014
@@ -212,8 +212,8 @@
<p>Always do a merge in this case (not a rebase):</p>
<div class="codehilite"><pre><span class="n">git</span> <span
class="n">checkout</span> <span class="n">master</span>
<span class="n">git</span> <span class="n">merge</span> <span
class="n">deltaspike</span><span class="o">-</span><span
class="p">[</span><span class="n">version</span><span class="p">]</span>
-<span class="n">git</span> <span class="n">push</span> <span
class="n">deltaspike</span><span class="o">-</span><span
class="p">[</span><span class="n">version</span><span class="p">]</span>
-<span class="n">git</span> <span class="n">push</span> <span
class="n">deltaspike</span><span class="o">-</span><span
class="n">project</span><span class="o">-</span><span class="p">[</span><span
class="n">version</span><span class="p">]</span>
+<span class="n">git</span> <span class="n">push</span> <span
class="n">origin</span> <span class="n">deltaspike</span><span
class="o">-</span><span class="p">[</span><span class="n">version</span><span
class="p">]</span>
+<span class="n">git</span> <span class="n">push</span> <span
class="n">origin</span> <span class="n">deltaspike</span><span
class="o">-</span><span class="n">project</span><span class="o">-</span><span
class="p">[</span><span class="n">version</span><span class="p">]</span>
</pre></div>
