You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by bu...@apache.org on 2014/01/29 08:01:14 UTC

svn commit: r895703 - in /websites/staging/struts/trunk/content: ./ git-for-struts.html

Author: buildbot
Date: Wed Jan 29 07:01:13 2014
New Revision: 895703

Log:
Staging update by buildbot for struts

Modified:
    websites/staging/struts/trunk/content/   (props changed)
    websites/staging/struts/trunk/content/git-for-struts.html

Propchange: websites/staging/struts/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jan 29 07:01:13 2014
@@ -1 +1 @@
-1562369
+1562370

Modified: websites/staging/struts/trunk/content/git-for-struts.html
==============================================================================
--- websites/staging/struts/trunk/content/git-for-struts.html (original)
+++ websites/staging/struts/trunk/content/git-for-struts.html Wed Jan 29 07:01:13 2014
@@ -175,7 +175,11 @@
                 
         <div id="bodyColumn" >
                                   
-            <p></p><h1>Using Git with Struts</h1><p>Struts uses Git and to manage the repository the git-flow was adopted, to read more about that please follow the links below: - <a class="externalLink" href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a> - <a class="externalLink" href="https://github.com/nvie/gitflow">https://github.com/nvie/gitflow</a></p><div class="section"><h2>Contributing with GitHub<a name="Contributing_with_GitHub"></a></h2><p>If you would like to contribute using the GitHub tools you need to know we can only accept your work if we have your <a class="externalLink" href="http://www.apache.org/licenses/icla.txt">ICLA</a> on file. Please read the document carefully, sign and send it to us. Basically this document protects you and the end users for legal problems. It allows the Apache Software Foundation to use your code and distribute it. You should receive an email a few days after you sub
 mitted it and appear in the <a class="externalLink" href="http://people.apache.org/committer-index.html">committer index</a> in the section unlisted CLAs.</p><p>Once done, you can clone the <a class="externalLink" href="https://github.com/apache/struts">Apache Struts mirror on GitHub</a>:</p>
+            <p></p><h1>Using Git with Struts</h1><p>Struts uses Git and to manage the repository the git-flow was adopted, to read more about that please follow the links below:</p>
+<ul>
+  <li><a class="externalLink" href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a></li>
+  <li><a class="externalLink" href="https://github.com/nvie/gitflow">https://github.com/nvie/gitflow</a></li>
+</ul><div class="section"><h2>Contributing with GitHub<a name="Contributing_with_GitHub"></a></h2><p>If you would like to contribute using the GitHub tools you need to know we can only accept your work if we have your <a class="externalLink" href="http://www.apache.org/licenses/icla.txt">ICLA</a> on file. Please read the document carefully, sign and send it to us. Basically this document protects you and the end users for legal problems. It allows the Apache Software Foundation to use your code and distribute it. You should receive an email a few days after you submitted it and appear in the <a class="externalLink" href="http://people.apache.org/committer-index.html">committer index</a> in the section unlisted CLAs.</p><p>Once done, you can clone the <a class="externalLink" href="https://github.com/apache/struts">Apache Struts mirror on GitHub</a>:</p>
 <div class="source"><pre class="prettyprint">git clone git@github.com:apache/struts.git struts-mirror.git
 </pre></div><p>Please create an issue on our <a class="externalLink" href="https://issues.apache.org/jira/browse/WW">issue tracker</a>. Youll receive an issue number which you should use to create a working branch (for example WW-4196).</p><p>If you are sending a pull request, please send it to the Apache Struts teams repo and not the official mirror. We cannot accept and close pull requests there which is the reason we have an own account. You can find it here:</p><p>[https://github.com/apachestruts/struts]</p><p>Please send the pull request to trunk.</p><p>It is of course possible to add us as upstream repo:</p>
 <div class="source"><pre class="prettyprint">git remote add upstream git@github.com:apachestruts/struts