Merge branch 'bc/filter-branch'

[git.git] / Documentation / git-check-ref-format.txt

diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index 3ea720dd005f7a9b4a66a419cf5438a3a7d0fa8b..a676880429086a7f65cf3264bf98b379bc9c22ec 100644 (file)
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -19,8 +19,9 @@ branch head is stored under `$GIT_DIR/refs/heads` directory, and
 a tag is stored under `$GIT_DIR/refs/tags` directory.  git
 imposes the following rules on how refs are named:
 
 a tag is stored under `$GIT_DIR/refs/tags` directory.  git
 imposes the following rules on how refs are named:
 

-. It could be named hierarchically (i.e. separated with slash
-  `/`), but each of its component cannot begin with a dot `.`;
+. It can include slash `/` for hierarchical (directory)
+  grouping, but no slash-separated component can begin with a
+  dot `.`;

 
 . It cannot have two consecutive dots `..` anywhere;
 
 
 . It cannot have two consecutive dots `..` anywhere;
 


@@ -34,7 +35,7 @@ imposes the following rules on how refs are named:
 These rules makes it easy for shell script based tools to parse
 refnames, pathname expansion by the shell when a refname is used
 unquoted (by mistake), and also avoids ambiguities in certain
 These rules makes it easy for shell script based tools to parse
 refnames, pathname expansion by the shell when a refname is used
 unquoted (by mistake), and also avoids ambiguities in certain

-refname expressions (see gitlink:git-rev-parse[1]).  Namely:
+refname expressions (see linkgit:git-rev-parse[1]).  Namely:

 
 . double-dot `..` are often used as in `ref1..ref2`, and in some
   context this notation means `{caret}ref1 ref2` (i.e. not in
 
 . double-dot `..` are often used as in `ref1..ref2`, and in some
   context this notation means `{caret}ref1 ref2` (i.e. not in


@@ -46,9 +47,9 @@ refname expressions (see gitlink:git-rev-parse[1]).  Namely:
 . colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
   value and store it in dstref" in fetch and push operations.
   It may also be used to select a specific object such as with
 . colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
   value and store it in dstref" in fetch and push operations.
   It may also be used to select a specific object such as with

-  gitlink:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".
+  linkgit:git-cat-file[1] "git-cat-file blob v1.3.3:refs.c".

 
 
 GIT
 ---
 
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite