Mercurial > hg
comparison mercurial/help/glossary.txt @ 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 | 9232fa4fd1ba |
comparison
equal
deleted
inserted
replaced
14629:c3f2152e423d | 14630:f536151d392f |
---|---|
2 Any changeset that can be reached by an unbroken chain of parent | 2 Any changeset that can be reached by an unbroken chain of parent |
3 changesets from a given changeset. More precisely, the ancestors | 3 changesets from a given changeset. More precisely, the ancestors |
4 of a changeset can be defined by two properties: a parent of a | 4 of a changeset can be defined by two properties: a parent of a |
5 changeset is an ancestor, and a parent of an ancestor is an | 5 changeset is an ancestor, and a parent of an ancestor is an |
6 ancestor. See also: 'Descendant'. | 6 ancestor. See also: 'Descendant'. |
7 | |
8 Bookmark | |
9 Bookmarks are pointers to certain commits that move when | |
10 committing. They are similar to tags in that it is possible to use | |
11 bookmark names in all places where Mercurial expects a changeset | |
12 ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along | |
13 when you make a commit. | |
14 | |
15 Bookmarks can be renamed, copied and deleted. Bookmarks are local, | |
16 unless they are explicitly pushed or pulled between repositories. | |
17 Pushing and pulling bookmarks allow you to collaborate with others | |
18 on a branch without creating a named branch. | |
7 | 19 |
8 Branch | 20 Branch |
9 (Noun) A child changeset that has been created from a parent that | 21 (Noun) A child changeset that has been created from a parent that |
10 is not a head. These are known as topological branches, see | 22 is not a head. These are known as topological branches, see |
11 'Branch, topological'. If a topological branch is named, it becomes | 23 'Branch, topological'. If a topological branch is named, it becomes |