svn commit: r922106 - in /websites/staging/maven/trunk/content: ./ developers/conventions/git.html maven-site-1.0-site.jar

[bu...@apache.org]

Author: buildbot
Date: Sat Sep 13 20:58:29 2014
New Revision: 922106

Log:
Staging update by buildbot for maven

Modified:
    websites/staging/maven/trunk/content/   (props changed)
    websites/staging/maven/trunk/content/developers/conventions/git.html
    websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Sep 13 20:58:29 2014
@@ -1 +1 @@
-1624778
+1624783

Modified: websites/staging/maven/trunk/content/developers/conventions/git.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/git.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/git.html Sat Sep 13 20:58:29 2014
@@ -320,9 +320,8 @@ git fetch --all</pre></div>
 <p>In this setup, running &quot;git push&quot; will normally push to your personal github account. Furthermore, all pull requests from github are also fetched to your local clone, use</p>
 <div>
 <pre>gitk --all</pre></div>
-<p>to try to make some sense of it all. This is an important command to understand! (gitk may need to be installed additionally)</p></div></div>
-<div class="section">
-<h2><a name="gitk_also_has_a_quite_excellent_context_menu_that_is_far_more_context_sensitive_than_most_people_realize_at_first_impression._Right-clicking_on_a_commit_in_a_github_pull-request_will_allow_you_to_cherry-pick_straight_in_the_gui."></a>gitk also has a quite excellent context menu that is far more context sensitive than most people realize at first impression. Right-clicking on a commit in a github pull-request will allow you to cherry-pick straight in the gui.</h2>
+<p>to try to make some sense of it all. This is an important command to understand! (gitk may need to be installed additionally)</p>
+<p>gitk also has a quite excellent context menu that is far more context sensitive than most people realize at first impression. Right-clicking on a commit in a github pull-request will allow you to cherry-pick straight in the gui.</p>
 <p>If you're working on the master branch, you can do stuff like this:</p>
 <div>
 <pre>git push # your github account
@@ -337,7 +336,7 @@ git push apache # upload to apache</pre>
 <pre>
 git checkout pr/10
 git rebase apache/master
-git push apache</pre></div></div>
+git push apache</pre></div></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.