summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Jacobson <owen.jacobson@grimoire.ca>2013-06-10 10:01:01 -0400
committerOwen Jacobson <owen.jacobson@grimoire.ca>2013-06-10 10:01:01 -0400
commite891e8c667ce8b85b9491fbd6f9f9eeee8e183c3 (patch)
tree77790a9e8285fd17ae0928e534878af897be6c07
parentf60c5a6fdd1f5fc5cf3a7d76d0e4029f7bf12b9b (diff)
Editorial improvements to the git namespaces:
* Made it more obvious that `refs/stash` isn't a namespace (thanks, @des4maisons!). * Tense agreement (thanks, @wlonk!). * Added a mention of the `git-bisect` bits.
-rw-r--r--wiki/git/theory-and-practice/refs-and-names.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/wiki/git/theory-and-practice/refs-and-names.md b/wiki/git/theory-and-practice/refs-and-names.md
index 94874c9..45f58f2 100644
--- a/wiki/git/theory-and-practice/refs-and-names.md
+++ b/wiki/git/theory-and-practice/refs-and-names.md
@@ -21,8 +21,8 @@ identically, after resolving the ref down to the SHA-1.
Every operation in Git that uses a name of some sort, including branching
(branch names), tagging (tag names), fetching (remote-tracking branch names),
-and pushing (many kinds of name) expand those names to refs, using a namespace
-convention. The following namespaces are common:
+and pushing (many kinds of name), expands those names to refs, using a
+namespace convention. The following namespaces are common:
* `refs/heads/NAME`: branches. The branch name is the ref name with
`refs/heads/` removed. Names generally point to commits.
@@ -34,6 +34,12 @@ convention. The following namespaces are common:
* `refs/tags/NAME`: tags. The tag name is the ref name with `refs/heads/`
removed. Names generally point to commits or tag objects.
+* `refs/bisect/STATE`: `git bisect` markers for known-good and known-bad
+ revisions, from which the rest of the bisect state can be derived.
+
+There are also a few special refs directly in the `refs/` namespace, most
+notably:
+
* `refs/stash`: The most recent stash entry, as maintained by `git stash`.
(Other stash entries are maintained by a separate system.) Names generally
point to commits.