From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Mar 2013 19:40:04 +0000 (-0700)
Subject: Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint
X-Git-Tag: v1.8.2.1~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c17866d7b693771e558d972b52d786c29e7ddd76

Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint

* gp/avoid-explicit-mention-of-dot-git-refs:
Fix ".git/refs" stragglers
---

c17866d7b693771e558d972b52d786c29e7ddd76
diff --cc Documentation/config.txt
index bbba728d09,91f37be127..b3023b8172
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -442,8 -422,8 +442,8 @@@ core.sharedRepository:
  	See linkgit:git-init[1]. False by default.
  
  core.warnAmbiguousRefs::
 -	If true, git will warn you if the ref name you passed it is ambiguous
 +	If true, Git will warn you if the ref name you passed it is ambiguous
- 	and might match multiple refs in the .git/refs/ tree. True by default.
+ 	and might match multiple refs in the repository. True by default.
  
  core.compression::
  	An integer -1..9, indicating a default compression level.