Merge branch 'ma/rev-list-options-docfix'
Docfix.
* ma/rev-list-options-docfix:
rev-list-options.txt: start a list for `show-pulls`
diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt
index 44b4b61..15518d0 100644
--- a/Documentation/RelNotes/2.27.0.txt
+++ b/Documentation/RelNotes/2.27.0.txt
@@ -24,6 +24,10 @@
users may find annoying---those who prefer not to rebase need to
set the variable to false to squelch the warning.
+ * The transport protocol version 2, which was promoted to the default
+ in Git 2.26 release, turned out to have some remaining rough edges,
+ so it has been demoted from the default.
+
UI, Workflows & Features
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index 370d62d..9cd7a59 100644
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -223,7 +223,7 @@
can then be copied alongside and modified as appropriate. This second, modified
file is usually ignored to prevent accidentally committing it.
-[[files-in-.gitignore-are-tracked]]
+[[files-in-gitignore-are-tracked]]
I asked Git to ignore various files, yet they are still tracked::
A `gitignore` file ensures that certain file(s) which are not
tracked by Git remain untracked. However, sometimes particular
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 165ce7a..c30d71a 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.27.0-rc1
+DEF_VER=v2.27.0-rc2
LF='
'
diff --git a/ci/config/allow-refs.sample b/ci/config/allow-ref.sample
similarity index 91%
rename from ci/config/allow-refs.sample
rename to ci/config/allow-ref.sample
index f157f19..af0e076 100755
--- a/ci/config/allow-refs.sample
+++ b/ci/config/allow-ref.sample
@@ -7,8 +7,9 @@
# your repository:
#
# git checkout -b ci-config
-# cp allow-refs.sample allow-refs
-# $EDITOR allow-refs
+# cp allow-ref.sample allow-ref
+# $EDITOR allow-ref
+# git add allow-ref
# git commit -am "implement my ci preferences"
# git push
#