From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 Aug 2008 08:40:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc3~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0bb3a0ba9e3cbb283a747e4736bcf7484d076a73;p=git.git

Merge branch 'maint'

* maint:
  asciidoc markup fixes
  Fail properly when cloning from invalid HTTP URL

Conflicts:
	Documentation/git-push.txt
---

0bb3a0ba9e3cbb283a747e4736bcf7484d076a73
diff --cc Documentation/git-push.txt
index 050c3ddae,60d53391d..45c96435f
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -30,9 -29,9 +30,9 @@@ OPTION
  	The "remote" repository that is destination of a push
  	operation.  See the section <<URLS,GIT URLS>> below.
  
 -<refspec>::
 +<refspec>...::
- 	The canonical format of each <refspec> parameter is
- 	`+?<src>:<dst>`; that is, an optional plus `+`, followed
+ 	The canonical format of a <refspec> parameter is
+ 	`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
  	by the source ref, followed by a colon `:`, followed by
  	the destination ref.
  +