Merge branch 'ma/asciidoctor-fixes-more'
Documentation mark-up fixes. * ma/asciidoctor-fixes-more: Documentation: turn middle-of-line tabs into spaces git-svn.txt: drop escaping '\' that ends up being rendered git.txt: remove empty line before list continuation config/fsck.txt: avoid starting line with dash config/diff.txt: drop spurious backtickmaint
commit
6d281f70cc
|
@ -10,7 +10,7 @@ diff.autoRefreshIndex::
|
|||
|
||||
diff.dirstat::
|
||||
A comma separated list of `--dirstat` parameters specifying the
|
||||
default behavior of the `--dirstat` option to linkgit:git-diff[1]`
|
||||
default behavior of the `--dirstat` option to linkgit:git-diff[1]
|
||||
and friends. The defaults can be overridden on the command line
|
||||
(using `--dirstat=<param1,param2,...>`). The fallback defaults
|
||||
(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.
|
||||
|
|
|
@ -23,9 +23,9 @@ When `fsck.<msg-id>` is set, errors can be switched to warnings and
|
|||
vice versa by configuring the `fsck.<msg-id>` setting where the
|
||||
`<msg-id>` is the fsck message ID and the value is one of `error`,
|
||||
`warn` or `ignore`. For convenience, fsck prefixes the error/warning
|
||||
with the message ID, e.g. "missingEmail: invalid author/committer line
|
||||
- missing email" means that setting `fsck.missingEmail = ignore` will
|
||||
hide that issue.
|
||||
with the message ID, e.g. "missingEmail: invalid author/committer
|
||||
line - missing email" means that setting `fsck.missingEmail = ignore`
|
||||
will hide that issue.
|
||||
+
|
||||
In general, it is better to enumerate existing objects with problems
|
||||
with `fsck.skipList`, instead of listing the kind of breakages these
|
||||
|
|
|
@ -31,7 +31,7 @@ OPTIONS
|
|||
displayed.
|
||||
|
||||
--refs::
|
||||
Do not show peeled tags or pseudorefs like HEAD in the output.
|
||||
Do not show peeled tags or pseudorefs like `HEAD` in the output.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
|
|
|
@ -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 @@ Like 'git rebase'; this requires that the working tree be clean
|
|||
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 @@ This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file
|
|||
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 @@ 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
|
||||
|
@ -1154,7 +1154,7 @@ fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove
|
|||
|
||||
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
|
||||
|
|
|
@ -536,7 +536,6 @@ other
|
|||
The command-line parameters passed to the configured command are
|
||||
determined by the ssh variant. See `ssh.variant` option in
|
||||
linkgit:git-config[1] for details.
|
||||
|
||||
+
|
||||
`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
|
||||
by the shell, which allows additional arguments to be included.
|
||||
|
|
Loading…
Reference in New Issue