diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-08-09 01:40:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-08-09 01:40:08 -0700 |
commit | 0bb3a0ba9e3cbb283a747e4736bcf7484d076a73 (patch) | |
tree | 8e922c74687a8f335ea422a0eb9643a54d0d8c9b /Documentation/git-push.txt | |
parent | a9fd1383a73878284d4157b20ac7c735e876102e (diff) | |
parent | 0f4f4d1597219bad74c4fde624321d8a05d1b55e (diff) | |
download | git-0bb3a0ba9e3cbb283a747e4736bcf7484d076a73.tar.gz git-0bb3a0ba9e3cbb283a747e4736bcf7484d076a73.tar.xz |
Merge branch 'maint'
* maint:
asciidoc markup fixes
Fail properly when cloning from invalid HTTP URL
Conflicts:
Documentation/git-push.txt
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r-- | Documentation/git-push.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 050c3ddae..45c96435f 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -31,8 +31,8 @@ OPTIONS operation. See the section <<URLS,GIT URLS>> below. <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. + |