aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-12 15:40:59 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-12 15:40:59 -0800
commitca5812d2e3c72b09008422975740aff41a2c65a0 (patch)
treefefd6e9ebfefe00521845530177e4c3a1296feea
parent9b4c8b0ae8a71535ff03a4ad88ac8ad67d58d845 (diff)
parent341d9a48cc4a6993f952c5c13417ba88227ef427 (diff)
downloadgit-ca5812d2e3c72b09008422975740aff41a2c65a0.tar.gz
git-ca5812d2e3c72b09008422975740aff41a2c65a0.tar.xz
Merge branch 'maint'
* maint: Fix typo in 1.6.6.2 release notes Re-fix check-ref-format documentation mark-up
-rw-r--r--Documentation/RelNotes-1.6.6.2.txt2
-rw-r--r--Documentation/git-check-ref-format.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.6.6.2.txt b/Documentation/RelNotes-1.6.6.2.txt
index 1a0ba377c..4eaddc010 100644
--- 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 a8c0b8061..e1c4320f0 100644
--- 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