From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:23 +0000 (+0900)
Subject: Merge branch 'tz/git-svn-doc-markup-fix'
X-Git-Tag: v2.22.0-rc0~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6e0bef3792fd30189f9310a595cb9ebf7a83c402?ds=inline;hp=-c

Merge branch 'tz/git-svn-doc-markup-fix'

Doc formatting fix.

* tz/git-svn-doc-markup-fix:
Documentation/git-svn: improve asciidoctor compatibility
---

6e0bef3792fd30189f9310a595cb9ebf7a83c402
diff --combined Documentation/git-svn.txt
index 223788fa3e,81aaef8e4e..30711625fd
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@@ -126,7 -126,7 +126,7 @@@ your Perl's Getopt::Long is < v2.37)
  	command-line argument.
  +
  This automatically updates the rev_map if needed (see
 -'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
 +'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
  
  --localtime;;
  	Store Git commit times in the local time zone instead of UTC.  This
@@@ -239,7 -239,7 +239,7 @@@ Like 'git rebase'; this requires that t
  and have no uncommitted changes.
  +
  This automatically updates the rev_map if needed (see
 -'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
 +'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
  
  -l;;
  --local;;
@@@ -524,7 -524,7 +524,7 @@@ This will set the property 'svn:keyword
  	way to repair the repo is to use 'reset'.
  +
  Only the rev_map and refs/remotes/git-svn are changed (see
 -'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
 +'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
  Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to
  move local branches onto the new tree.
  
@@@ -760,7 -760,7 +760,7 @@@ svn-remote.<name>.noMetadata:
  +
  This option can only be used for one-shot imports as 'git svn'
  will not be able to fetch again without metadata. Additionally,
 -if you lose your '$GIT_DIR/svn/\*\*/.rev_map.*' files, 'git svn' will not
 +if you lose your '$GIT_DIR/svn/\**/.rev_map.*' files, 'git svn' will not
  be able to rebuild them.
  +
  The 'git svn log' command will not work on repositories using
@@@ -1100,10 -1100,10 +1100,10 @@@ listed below are allowed
  	tags = tags/*/project-a:refs/remotes/project-a/tags/*
  ------------------------------------------------------------------------
  
- Keep in mind that the '\*' (asterisk) wildcard of the local ref
- (right of the ':') *must* be the farthest right path component;
+ Keep in mind that the `*` (asterisk) wildcard of the local ref
+ (right of the `:`) *must* be the farthest right path component;
  however the remote wildcard may be anywhere as long as it's an
- independent path component (surrounded by '/' or EOL).   This
+ independent path component (surrounded by `/` or EOL).   This
  type of configuration is not automatically created by 'init' and
  should be manually entered with a text-editor or using 'git config'.
  
@@@ -1154,7 -1154,7 +1154,7 @@@ fetching, then $GIT_DIR/svn/.metadata m
  
  FILES
  -----
 -$GIT_DIR/svn/\*\*/.rev_map.*::
 +$GIT_DIR/svn/\**/.rev_map.*::
  	Mapping between Subversion revision numbers and Git commit
  	names.  In a repository where the noMetadata option is not set,
  	this can be rebuilt from the git-svn-id: lines that are at the