[--msg-filter <command>] [--commit-filter <command>]\r
[--tag-name-filter <command>] [--subdirectory-filter <directory>]\r
[--original <namespace>] [-d <directory>] [-f | --force]\r
- <rev-list options></div></div>\r
+ [<rev-list options>…]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Jan-2008 03:19:58 UTC\r
+Last updated 01-Feb-2008 10:52:24 UTC\r
</div>\r
</div>\r
</body>\r
[--msg-filter <command>] [--commit-filter <command>]
[--tag-name-filter <command>] [--subdirectory-filter <directory>]
[--original <namespace>] [-d <directory>] [-f | --force]
- <rev-list options>
+ [<rev-list options>...]
DESCRIPTION
-----------
</p>\r
</li>\r
</ul>\r
-<p>Here is an illustration, by Jon Loeliger. Both node B and C are\r
-commit parents of commit node A. Parent commits are ordered\r
+<p>Here is an illustration, by Jon Loeliger. Both commit nodes B\r
+and C are parents of commit node A. Parent commits are ordered\r
left-to-right.</p>\r
<div class="literalblock">\r
<div class="content">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Jan-2008 08:28:23 UTC\r
+Last updated 01-Feb-2008 10:52:24 UTC\r
</div>\r
</div>\r
</body>\r
(typically the current branch), and stage 3 is the version from
the branch being merged.
-Here is an illustration, by Jon Loeliger. Both node B and C are
-commit parents of commit node A. Parent commits are ordered
+Here is an illustration, by Jon Loeliger. Both commit nodes B
+and C are parents of commit node A. Parent commits are ordered
left-to-right.
G H I J