Mercurial > hg
changeset 14630:f536151d392f
glossary: add entry for "Bookmark"
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Wed, 15 Jun 2011 17:10:26 +0200 |
| parents | c3f2152e423d |
| children | 234b9795d74e |
| files | mercurial/help/glossary.txt |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/glossary.txt Wed Jun 15 17:10:16 2011 +0200 +++ b/mercurial/help/glossary.txt Wed Jun 15 17:10:26 2011 +0200 @@ -5,6 +5,18 @@ changeset is an ancestor, and a parent of an ancestor is an ancestor. See also: 'Descendant'. +Bookmark + Bookmarks are pointers to certain commits that move when + committing. They are similar to tags in that it is possible to use + bookmark names in all places where Mercurial expects a changeset + ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along + when you make a commit. + + Bookmarks can be renamed, copied and deleted. Bookmarks are local, + unless they are explicitly pushed or pulled between repositories. + Pushing and pulling bookmarks allow you to collaborate with others + on a branch without creating a named branch. + Branch (Noun) A child changeset that has been created from a parent that is not a head. These are known as topological branches, see