You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2016/08/15 17:50:47 UTC
apex-site git commit: from 5897f47b334ec6532269d0e09dcb5ac1c9004e62
Repository: apex-site
Updated Branches:
refs/heads/asf-site fcde15f5b -> 52b7437c6
from 5897f47b334ec6532269d0e09dcb5ac1c9004e62
Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/52b7437c
Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/52b7437c
Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/52b7437c
Branch: refs/heads/asf-site
Commit: 52b7437c6cf69e0ff58bc05ce65735f8349e6f0f
Parents: fcde15f
Author: Thomas Weise <th...@datatorrent.com>
Authored: Mon Aug 15 10:50:32 2016 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Mon Aug 15 10:50:32 2016 -0700
----------------------------------------------------------------------
content/contributing.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-site/blob/52b7437c/content/contributing.html
----------------------------------------------------------------------
diff --git a/content/contributing.html b/content/contributing.html
index 434104a..22a982f 100644
--- a/content/contributing.html
+++ b/content/contributing.html
@@ -105,7 +105,7 @@
<a href="https://github.com/apache/apex-core/">https://github.com/apache/apex-core/</a> </li>
<li>Clone the <strong>fork</strong> on your local workspace (one time step):<br><code>git clone https://github.com/{github_username}/apex-core.git</code></li>
<li>Add <a href="https://github.com/apache/apex-core">apex core</a> as a remote repository (one time step):<br><code>git remote add upstream https://github.com/apache/apex-core</code></li>
-<li>Ensure that your git user name and email are <a href="https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup#Your-Identity">configured</a>, this will make it much easier to keep track of contributors.</li>
+<li>Ensure that your git user name and email are <a href="https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup#Your-Identity">configured</a>, this will make it much easier to keep track of contributors (one time step).</li>
<li>Create a new branch from the <a href="https://github.com/apache/apex-core/tree/master">master</a> branch. <strong>Name your branch with the JIRA number in it, e.g. <code>APEXCORE-123.my-feature</code>.</strong><br><code>git checkout -b APEXCORE-123.my-feature -t upstream/master</code><br>Creating a local branch that tracks a remote makes pull easier (no need to specify the remote branch while pulling). A branch can be made to track a remote branch anytime, not necessarily at its creation by:<br><code>git branch -u upstream/master</code></li>
<li>When adding new files, please include the Apache v2.0 license header.<ul>
<li>From the top level directory, run <code>mvn license:check -Dlicense.skip=false</code> to check correct header formatting.</li>