##// END OF EJS Templates
bookmarks: clarify help for use of merge and update
Kevin Bullock -
r15620:73faa266 default
parent child Browse files
Show More
@@ -726,10 +726,10 b' def bookmark(ui, repo, mark=None, rev=No'
726 rename=None, inactive=False):
726 rename=None, inactive=False):
727 '''track a line of development with movable markers
727 '''track a line of development with movable markers
728
728
729 Bookmarks are pointers to certain commits that move when
729 Bookmarks are pointers to certain commits that move when committing.
730 committing. Bookmarks are local. They can be renamed, copied and
730 Bookmarks are local. They can be renamed, copied and deleted. It is
731 deleted. It is possible to use bookmark names in :hg:`merge` and
731 possible to use :hg:`merge NAME` to merge from a given bookmark, and
732 :hg:`update` to merge and update respectively to a given bookmark.
732 :hg:`update NAME` to update to a given bookmark.
733
733
734 You can use :hg:`bookmark NAME` to set a bookmark on the working
734 You can use :hg:`bookmark NAME` to set a bookmark on the working
735 directory's parent revision with the given name. If you specify
735 directory's parent revision with the given name. If you specify
General Comments 0
You need to be logged in to leave comments. Login now