Author: buildbot
Date: Tue Sep 10 19:38:01 2013
New Revision: 877953
Log:
Staging update by buildbot for struts
Modified:
websites/staging/struts/trunk/content/ (props changed)
websites/staging/struts/trunk/content/dev/git-for-struts.html
Propchange: websites/staging/struts/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 10 19:38:01 2013
@@ -1 +1 @@
-1521558
+1521605
Modified: websites/staging/struts/trunk/content/dev/git-for-struts.html
==============================================================================
--- websites/staging/struts/trunk/content/dev/git-for-struts.html (original)
+++ websites/staging/struts/trunk/content/dev/git-for-struts.html Tue Sep 10
19:38:01 2013
@@ -208,6 +208,12 @@ git svn rebase
<div class="source"><pre class="prettyprint">git reset --hard origin/mybranch
</pre></div><p>For reference, you can override the commit url:</p>
<div class="source"><pre class="prettyprint">git svn dcommit --commit-url
https://svn.apache.org/repos/asf/struts/struts2/branches/mybranch
+</pre></div></div><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/struts2";>Apache Struts
mirror on GitHub</a>:</p>
+<div class="source"><pre class="prettyprint">git clone
g...@github.com:apache/struts2.git struts2-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>
+<div class="source"><pre
class="prettyprint">[https://github.com/apachestruts/struts2](https://github.com/apachestruts/struts2)
+</pre></div><p>It is of course possible to add us as upstream repo:</p>
+<div class="source"><pre class="prettyprint">git remote add upstream
https://github.com/apachestruts/struts2
</pre></div></div><div class="section"><h2>Working with remote branches from
GitHub<a name="Working_with_remote_branches_from_GitHub"></a></h2><p>You can
add a remote branch from GitHub like this:</p>
<div class="source"><pre class="prettyprint">git remote add opensourceio
https://github.com/opensourceio/struts.git
</pre></div><p>Pull changes with:</p>
