Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 Aug 2008 08:40:08 +0000 (01:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 Aug 2008 08:40:08 +0000 (01:40 -0700)
commit0bb3a0ba9e3cbb283a747e4736bcf7484d076a73
tree8e922c74687a8f335ea422a0eb9643a54d0d8c9b
parenta9fd1383a73878284d4157b20ac7c735e876102e
parent0f4f4d1597219bad74c4fde624321d8a05d1b55e
Merge branch 'maint'

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

Conflicts:
Documentation/git-push.txt
Documentation/git-push.txt
Documentation/git-rerere.txt
Documentation/pull-fetch-param.txt
transport.c