]> git.mjollnir.org Git - moodle.git/commitdiff
Added -kk tags for keywords
authormoodler <moodler>
Fri, 4 Jun 2004 06:04:08 +0000 (06:04 +0000)
committermoodler <moodler>
Fri, 4 Jun 2004 06:04:08 +0000 (06:04 +0000)
lang/en/docs/cvs.html

index 74b19cf9879c0c6fbd01349c2d33ec1df026a604..124a1027b0c9f590901aedd2e755d2e581a47221 100644 (file)
@@ -171,7 +171,7 @@ update -dP</div>
             <div class="commandline">cvs update -dPA</div>
           </li>
           <li>Merge everything on the branch since the last merge, into your trunk version<br><br>
-            <div class="commandline">cvs update -j MOODLE_13_MERGED -j MOODLE_13_STABLE</div>
+            <div class="commandline">cvs update -kk -j MOODLE_13_MERGED -j MOODLE_13_STABLE</div>
              </li>
           <li>Check the merged copy back into CVS trunk version<br><br>
             <div class="commandline">cvs commit</div>
@@ -210,7 +210,7 @@ update -dP</div>
                  <br><br>
             <div class="commandline">
             <strong>cvs update -dPA</strong><br />
-            <strong>cvs update -j <span class="style1">MOODLE_XX_WIDGET</span></strong><br />
+            <strong>cvs update -kk -j <span class="style1">MOODLE_XX_WIDGET</span></strong><br />
             <strong>cvs commit </strong></div>
           </li>
       </ol>