diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-10-22 04:12:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-10-22 04:12:17 +0000 |
| commit | d2179ef025405832dff42141faed13199886b61c (patch) | |
| tree | ffbde742771a380129d0223749ed086fbea39271 /git-merge.html | |
| parent | 7f9fa86e7b663383dc905c5b41bedda5cedf02e6 (diff) | |
| download | git-htmldocs-d2179ef025405832dff42141faed13199886b61c.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-90-gd4c43
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index d27799c52..075dc6a69 100644 --- a/git-merge.html +++ b/git-merge.html @@ -866,7 +866,7 @@ no-renormalize </p>
</dd>
<dt>
-subtree[=path]
+subtree[=<path>]
</dt>
<dd>
<p>
@@ -1068,7 +1068,7 @@ branch.<name>.mergeoptions </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-30 00:02:58 UTC
+Last updated 2010-10-22 04:11:08 UTC
</div>
</div>
</body>
|