diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
commit | 3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch) | |
tree | 2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /gitcore-tutorial.html | |
parent | e1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff) | |
download | git-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz |
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'gitcore-tutorial.html')
-rw-r--r-- | gitcore-tutorial.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 7b2e82dd5..75d26cbe5 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -1265,7 +1265,7 @@ would be different)</p></div> <div class="listingblock">
<div class="content">
<pre><tt>Updating from ae3a2da... to a80b4aa....
-Fast forward (no commit created; -m option ignored)
+Fast-forward (no commit created; -m option ignored)
example | 1 +
hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)</tt></pre>
@@ -1274,7 +1274,7 @@ Fast forward (no commit created; -m option ignored) already been merged into the <tt>master</tt> branch, the merge operation did
not actually do a merge. Instead, it just updated the top of
the tree of your branch to that of the <tt>master</tt> branch. This is
-often called <em>fast forward</em> merge.</p></div>
+often called <em>fast-forward</em> merge.</p></div>
<div class="para"><p>You can run <tt>gitk --all</tt> again to see how the commit ancestry
looks like, or run <em>show-branch</em>, which tells you this.</p></div>
<div class="listingblock">
@@ -2040,7 +2040,7 @@ to follow, not easier.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-15 09:57:26 UTC
+Last updated 2009-11-16 02:10:14 UTC
</div>
</div>
</body>
|