aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-09 01:40:08 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-09 01:40:08 -0700
commit0bb3a0ba9e3cbb283a747e4736bcf7484d076a73 (patch)
tree8e922c74687a8f335ea422a0eb9643a54d0d8c9b /Documentation
parenta9fd1383a73878284d4157b20ac7c735e876102e (diff)
parent0f4f4d1597219bad74c4fde624321d8a05d1b55e (diff)
downloadgit-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')
-rw-r--r--Documentation/git-push.txt4
-rw-r--r--Documentation/git-rerere.txt6
-rw-r--r--Documentation/pull-fetch-param.txt2
3 files changed, 6 insertions, 6 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.
+
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 89f321b41..64715c17d 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -90,15 +90,15 @@ One way to do it is to pull master into the topic branch:
The commits marked with `*` touch the same area in the same
file; you need to resolve the conflicts when creating the commit
-marked with `+`. Then you can test the result to make sure your
+marked with `{plus}`. Then you can test the result to make sure your
work-in-progress still works with what is in the latest master.
After this test merge, there are two ways to continue your work
on the topic. The easiest is to build on top of the test merge
-commit `+`, and when your work in the topic branch is finally
+commit `{plus}`, and when your work in the topic branch is finally
ready, pull the topic branch into master, and/or ask the
upstream to pull from you. By that time, however, the master or
-the upstream might have been advanced since the test merge `+`,
+the upstream might have been advanced since the test merge `{plus}`,
in which case the final commit graph would look like this:
------------
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 00a8d2104..ebdd948cd 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -6,7 +6,7 @@
<refspec>::
The canonical format of a <refspec> parameter is
- `+?<src>:<dst>`; that is, an optional plus `+`, followed
+ `+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
by the source ref, followed by a colon `:`, followed by
the destination ref.
+