Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: clarify help for use of merge and update
authorKevin Bullock <kbullock@ringworld.org>
Wed, 07 Dec 2011 11:23:13 -0600
changeset 15620 73faa2664909
parent 15619 6c8573dd1b6b
child 15621 013688350c7d
bookmarks: clarify help for use of merge and update
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Dec 07 11:23:01 2011 -0600
+++ b/mercurial/commands.py	Wed Dec 07 11:23:13 2011 -0600
@@ -726,10 +726,10 @@
              rename=None, inactive=False):
     '''track a line of development with movable markers
 
-    Bookmarks are pointers to certain commits that move when
-    committing. Bookmarks are local. They can be renamed, copied and
-    deleted. It is possible to use bookmark names in :hg:`merge` and
-    :hg:`update` to merge and update respectively to a given bookmark.
+    Bookmarks are pointers to certain commits that move when committing.
+    Bookmarks are local. They can be renamed, copied and deleted. It is
+    possible to use :hg:`merge NAME` to merge from a given bookmark, and
+    :hg:`update NAME` to update to a given bookmark.
 
     You can use :hg:`bookmark NAME` to set a bookmark on the working
     directory's parent revision with the given name. If you specify
mercurial