Merge branch 'maint'

* maint:
Fix typo in 1.6.6.2 release notes
Re-fix check-ref-format documentation mark-up

diff --git a/Documentation/RelNotes-1.6.6.2.txt b/Documentation/RelNotes-1.6.6.2.txt
index 1a0ba377cfab318db87c293549f7c6e723c3d4fc..4eaddc0106e55aed0cf9a5192fc503dd706a582c 100644 (file)
--- a/Documentation/RelNotes-1.6.6.2.txt
+++ b/Documentation/RelNotes-1.6.6.2.txt
@@ -1,7 +1,7 @@
 Git v1.6.6.2 Release Notes
 ==========================
 
-Fixes since v1.6.6.2
+Fixes since v1.6.6.1
 --------------------
 
  * recursive merge didn't correctly diagnose its own programming errors,

diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index a8c0b80613496b5b6d25dd5aa6cdc9245a171609..e1c4320f02747cd8681c03f52ea22d64290d96ca 100644 (file)
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -43,7 +43,7 @@ imposes the following rules on how references are named:
 
 . They cannot contain a sequence `@{`.
 
-. They cannot contain a `\\`.
+. They cannot contain a `\`.
 
 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