summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-11 19:14:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-11 19:14:15 (GMT)
commit63b3db71d8b7e7565ec154daf9acc6f83bcd6f3a (patch)
tree2f65a35eafe7fd12dffa0d5abc041c5f4c394bad
parent288fe0cfb61d52d8f35fea38076a6ceea74389a2 (diff)
parent56a8aea0c61c26e2644514ede24cec35b06ee0d0 (diff)
downloadgit-63b3db71d8b7e7565ec154daf9acc6f83bcd6f3a.zip
git-63b3db71d8b7e7565ec154daf9acc6f83bcd6f3a.tar.gz
git-63b3db71d8b7e7565ec154daf9acc6f83bcd6f3a.tar.bz2
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/
-rw-r--r--Documentation/git-check-ref-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index 9044dfa..91a3622 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -60,7 +60,7 @@ Git imposes the following rules on how references are named:
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