From: Junio C Hamano Date: Fri, 11 Dec 2015 19:14:15 +0000 (-0800) Subject: Merge branch 'nd/doc-check-ref-format-typo' into maint X-Git-Tag: v2.7.0-rc1~7^2~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/63b3db71d8b7e7565ec154daf9acc6f83bcd6f3a?ds=inline;hp=-c Merge branch 'nd/doc-check-ref-format-typo' into maint * nd/doc-check-ref-format-typo: git-check-ref-format.txt: typo, s/avoids/avoid/ --- 63b3db71d8b7e7565ec154daf9acc6f83bcd6f3a diff --combined Documentation/git-check-ref-format.txt index 9044dfaada,cbbedea171..91a3622ee4 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@@ -60,7 -60,7 +60,7 @@@ Git imposes the following rules on how These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used - unquoted (by mistake), and also avoids ambiguities in certain + unquoted (by mistake), and also avoid ambiguities in certain reference name expressions (see linkgit:gitrevisions[7]): . A double-dot `..` is often used as in `ref1..ref2`, and in some @@@ -94,8 -94,8 +94,8 @@@ OPTION Interpret as a reference name pattern for a refspec (as used with remote repositories). If this option is enabled, is allowed to contain a single `*` - in place of a one full pathname component (e.g., - `foo/*/bar` but not `foo/bar*`). + in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` + but not `foo/bar*/baz*`). --normalize:: Normalize 'refname' by removing any leading slash (`/`)