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 /git-read-tree.html | |
| parent | e1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff) | |
| download | git-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz | |
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'git-read-tree.html')
| -rw-r--r-- | git-read-tree.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-read-tree.html b/git-read-tree.html index fe75155f1..955276ffe 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -514,7 +514,7 @@ run after <em>git-read-tree</em>.</p></div> <div class="para"><p>Typically, this is invoked as <tt>git read-tree -m $H $M</tt>, where $H
is the head commit of the current repository, and $M is the head
of a foreign tree, which is simply ahead of $H (i.e. we are in a
-fast forward situation).</p></div>
+fast-forward situation).</p></div>
<div class="para"><p>When two trees are specified, the user is telling <em>git-read-tree</em>
the following:</p></div>
<div class="olist"><ol>
@@ -779,7 +779,7 @@ have finished your work-in-progress), attempt the merge again.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-15 09:57:15 UTC
+Last updated 2009-11-16 02:10:13 UTC
</div>
</div>
</body>
|