summaryrefslogtreecommitdiffstats
path: root/gitcore-tutorial.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-13 00:09:03 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-13 00:09:03 -0800
commitd300403d591ea503f69ca10aeef5ae004e177ff3 (patch)
tree719f0a98ec462d9934b317f581744b2ad9905f4e /gitcore-tutorial.html
parent87460b8b963a11850c587ff0e6437b0902ee7da8 (diff)
downloadgit-htmldocs-d300403d591ea503f69ca10aeef5ae004e177ff3.tar.gz
Autogenerated HTML docs for v1.7.9-250-g624d3
Diffstat (limited to 'gitcore-tutorial.html')
-rw-r--r--gitcore-tutorial.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html
index a7fe1bc2b..26640198c 100644
--- a/gitcore-tutorial.html
+++ b/gitcore-tutorial.html
@@ -1537,7 +1537,7 @@ would be different)</p></div>
Fast-forward (no commit created; -m option ignored)
example | 1 +
hello | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)</tt></pre>
+ 2 files changed, 2 insertions(+)</tt></pre>
</div></div>
<div class="paragraph"><p>Because your branch did not contain anything more than what had
already been merged into the <tt>master</tt> branch, the merge operation did
@@ -2311,7 +2311,7 @@ to follow, not easier.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-02-13 00:08:46 PDT
</div>
</div>
</body>