summaryrefslogtreecommitdiffstats
path: root/gitcore-tutorial.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-17 16:57:41 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-17 16:57:41 -0700
commit281fd394a268e17e15f0869620a8f8fcaf28fbd1 (patch)
tree2a23fd9bd63a0c0ab7ecd78e51be240177570fc3 /gitcore-tutorial.html
parenta3cfb7673d419cac3d57ad89e67537288d20696f (diff)
downloadgit-htmldocs-281fd394a268e17e15f0869620a8f8fcaf28fbd1.tar.gz
Autogenerated HTML docs for v1.7.12-503-g59767
Diffstat (limited to 'gitcore-tutorial.html')
-rw-r--r--gitcore-tutorial.html11
1 files changed, 5 insertions, 6 deletions
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html
index 171b85891..281b36379 100644
--- a/gitcore-tutorial.html
+++ b/gitcore-tutorial.html
@@ -1481,12 +1481,11 @@ environment, is <tt>git show-branch</tt>.</p></div>
* [master^] Some fun.</tt></pre>
</div></div>
<div class="paragraph"><p>The first two lines indicate that it is showing the two branches
-and the first line of the commit log message from their
-top-of-the-tree commits, you are currently on <tt>master</tt> branch
-(notice the asterisk <tt>*</tt> character), and the first column for
-the later output lines is used to show commits contained in the
+with the titles of their top-of-the-tree commits, you are currently on
+<tt>master</tt> branch (notice the asterisk <tt>*</tt> character), and the first
+column for the later output lines is used to show commits contained in the
<tt>master</tt> branch, and the second column for the <tt>mybranch</tt>
-branch. Three commits are shown along with their log messages.
+branch. Three commits are shown along with their titles.
All of them have non blank characters in the first column (<tt>*</tt>
shows an ordinary commit on the current branch, <tt>-</tt> is a merge commit), which
means they are now part of the <tt>master</tt> branch. Only the "Some
@@ -2311,7 +2310,7 @@ to follow, not easier.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2012-09-17 16:55:59 PDT
</div>
</div>
</body>