Author: buildbot
Date: Thu Nov 29 13:14:22 2012
New Revision: 839999
Log:
Staging update by buildbot for isis
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/contributors/about.html
websites/staging/isis/trunk/content/contributors/using-git.html
websites/staging/isis/trunk/content/documentation.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov 29 13:14:22 2012
@@ -1 +1 @@
-1415147
+1415150
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov 29 13:14:22 2012
@@ -1 +1 @@
-1415147
+1415150
Modified: websites/staging/isis/trunk/content/contributors/about.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/about.html (original)
+++ websites/staging/isis/trunk/content/contributors/about.html Thu Nov 29
13:14:22 2012
@@ -193,7 +193,7 @@
</div>
<ul>
-<li>[Using Git][using-git.html)</li>
+<li><a href="using-git.html">Using Git</a></li>
<li><a href="coding-conventions.html">Coding conventions</a></li>
<li><a href="updating-the-cms-site.html">Updating the CMS site</a></li>
<li><a href="release-process.html">Release process</a></li>
Modified: websites/staging/isis/trunk/content/contributors/using-git.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/using-git.html (original)
+++ websites/staging/isis/trunk/content/contributors/using-git.html Thu Nov 29
13:14:22 2012
@@ -209,7 +209,7 @@
<ul>
<li><a href="http://git-scm.com/book";>Pro Git</a> book (free in electronic
form)</li>
<li><a href="https://github.s3.amazonaws.com/media/book.pdf";>Git community
book</a></li>
-<li><a href="http://git-scm.com/2011/07/11/reset.html";>git reset
demystified</a> - differentiating the working directory vs staging area
(index)</li>
+<li><a href="http://git-scm.com/2011/07/11/reset.html";>git reset
demystified</a> - differentiating the working directory vs index/staging
area</li>
</ul>
<p>And, of course, there is loads of good advice on <a
href="http://stackoverflow.com/questions/tagged/git";>stackoverflow.com</a></p>
@@ -235,17 +235,17 @@
<p>Three commands in particular worth knowing:</p>
-<ul>
-<li><code>git help *command*</code></p>
+<pre>git help <i>command</i></pre>
-<p>will open the man page in your web browser</li>
-<li><code>git gui</code></p>
+<p>will open the man page in your web browser</p>
-<p>will open up a basic GUI client to staging changes and making commits</li>
-<li><code>gitk --all</code></p>
+<pre>git gui</pre>
-<p>will open the commit history for all branches. In particular, you should
be able to see the local <code>master</code>, which branch you are working on
(the <code>HEAD</code>), and also the last known position of the
<code>master</code> branch from the central repo, called
<code>origin/master</code>.</li>
-</ul>
+<p>will open up a basic GUI client to staging changes and making commits</p>
+
+<pre>gitk --all</pre>
+
+<p>will open the commit history for all branches. In particular, you should
be able to see the local <code>master</code>, which branch you are working on
(the <code>HEAD</code>), and also the last known position of the
<code>master</code> branch from the central repo, called
<code>origin/master</code>.</p>
<p>If using Windows, note that github also have a dedicated <a
href="https://help.github.com/articles/set-up-git";>Windows client</a>. With a
little <a
href="http://haacked.com/archive/2012/05/30/using-github-for-windows-with-non-github-repositories.aspx";>hacking
around</a>, it can also be made to work with non-github repositories.</p>
@@ -378,8 +378,9 @@ git rebase --continue
<p>Once the rebase is finished, you'll see the branch <em>branchname</em> as a
direct descendent of <code>master</code> (use <code>gitk --all</code> to
confirm). You will still be on the <em>branchname</em>. To catch up
<code>master</code>, use:</p>
-<pre><code>git merge master --ff-only
-</code></pre>
+<pre>
+git merge master --ff-only
+</pre>
<p>The <code>--ff-only</code> ensures that the merge is a fast-forward; ie all
commits will have only a single parent, and no conflicts.</p>
@@ -404,8 +405,9 @@ git push -u origin <i>branchname</i>
<p>Thereafter, you can push subsequent commits using simply:</p>
-<pre><code>git push
-</code></pre>
+<pre>
+git push
+</pre>
<p>Doing this also allows others to collaborate on this branch, just as they
would for <code>master</code>.</p>
@@ -421,8 +423,9 @@ git push origin --delete <i>branchname</
<p>If you are working on something but are not ready to commit, then use:</p>
-<pre><code>git stash
-</code></pre>
+<pre>
+git stash
+</pre>
<p>If you use <code>gitk --all</code> then you'll see new commits are made
that hold the current state of your working directory and staging area.</p>
@@ -430,8 +433,9 @@ git push origin --delete <i>branchname</
<p>To reapply your stash, then use:</p>
-<pre><code>git stash pop
-</code></pre>
+<pre>
+git stash pop
+</pre>
<p>Note that stashing works even if switching branches</p>
Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Thu Nov 29 13:14:22
2012
@@ -218,7 +218,7 @@
<div class="span-one-third"></p>
<h3>Contributors</h3></li>
-<li>[Using Git][contributors/using-git.html)</li>
+<li><a href="contributors/using-git.html">Using Git</a></li>
<li><a href="contributors/coding-conventions.html">Coding Conventions</a></li>
<li><a href="contributors/updating-the-cms-site.html">Updating the CMS
site</a></li>
<li><a href="contributors/release-process.html">Release process</a></li>
