diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-07 16:05:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-07 22:41:24 -0700 |
| commit | 0f4f4d1597219bad74c4fde624321d8a05d1b55e (patch) | |
| tree | 621566432a34dde6833bd938c09e7602b64b4622 /Documentation/git-rerere.txt | |
| parent | e19b92becaafb7bee6cab22234c1179af20c12fc (diff) | |
| download | git-0f4f4d1597219bad74c4fde624321d8a05d1b55e.tar.gz | |
asciidoc markup fixes
I see quite a few pages on k.org site, e.g.
http://www.kernel.org/pub/software/scm/git/docs/git-rerere.html
(scroll down to find "After this test merge")
are misformatted to lose teletype text '+' that is followed by a comma,
and turns the following paragraph all typeset in teletype.
This patch seems to fix the issue at the site (meaning, with the
particular vintage of asciidoc and docbook toolchain), without breaking
things with the version I have at my primary development machine, but
wider testing is very much appreciated.
After this patch,
git grep '`+`,' -- Documentation
should report noting.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 37828e5c5a..8f12dc9759 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: ------------ |