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 backtick

diff --combined Documentation/git-config.txt
index d0b9c50d20489e421139b531b66d0b0e693c9781,7d857f34c6fd3069e8a47bb19dd84b876b83bf56..ff9310f9588a4a13028d1d4182a056262e1079d4
--- 1/Documentation/git-config.txt
--- 2/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@@ -126,7 -126,7 +126,7 @@@ See also <<FILES>>
  
  --local::
        For writing options: write to the repository `.git/config` file.
-       This is the default behavior.
+       This is the default behavior.
  +
  For reading options: read only from the repository `.git/config` rather than
  from all available files.
@@@ -240,9 -240,7 +240,9 @@@ Valid `<type>`'s include
        output.  The optional `default` parameter is used instead, if
        there is no color configured for `name`.
  +
 -`--type=color [--default=<default>]` is preferred over `--get-color`.
 +`--type=color [--default=<default>]` is preferred over `--get-color`
 +(but note that `--get-color` will omit the trailing newline printed by
 +`--type=color`).
  
  -e::
  --edit::

diff --combined Documentation/gitattributes.txt
index bdd11a2dddf81647937f1cf002b37e0b192b47d1,2b7cf69503fbf43f48f1cc5caf56bd5e2a867592..fa6454f10589b459b23e2604f5a56f8f6cbbec55
--- 1/Documentation/gitattributes.txt
--- 2/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -18,7 -18,7 +18,7 @@@ A `gitattributes` file is a simple tex
  
  Each line in `gitattributes` file is of form:
  
-       pattern attr1 attr2 ...
+       pattern attr1 attr2 ...
  
  That is, a pattern followed by an attributes list,
  separated by whitespaces. Leading and trailing whitespaces are
@@@ -346,7 -346,7 +346,7 @@@ automatic line ending conversion based 
  
  Use the following attributes if your '*.ps1' files are UTF-16 little
  endian encoded without BOM and you want Git to use Windows line endings
 -in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
 +in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
  you want UTF-16 little endian with BOM).
  Please note, it is highly recommended to
  explicitly define the line endings with `eol` if the `working-tree-encoding`

diff --combined Documentation/rev-list-options.txt
index ca959a72862048c205d67576fcd6c538f0c91b26,0cc88f58c4f6dea0e26652add173082464cb025e..9cf983d24d630a78427798f60c5d6f45b0b64c19
--- 1/Documentation/rev-list-options.txt
--- 2/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -743,7 -743,7 +743,7 @@@ explicitly-given commit or tree
  
  --filter-print-omitted::
        Only useful with `--filter=`; prints a list of the objects omitted
-       by the filter.  Object IDs are prefixed with a ``~'' character.
+       by the filter.  Object IDs are prefixed with a ``~'' character.
  
  --missing=<missing-action>::
        A debug option to help with future "partial clone" development.
@@@ -960,13 -960,6 +960,13 @@@ options may be given. See linkgit:git-d
        the parents have only two variants and the merge result picks
        one of them without modification.
  
 +--combined-all-paths::
 +      This flag causes combined diffs (used for merge commits) to
 +      list the name of the file from all parents.  It thus only has
 +      effect when -c or --cc are specified, and is likely only
 +      useful if filename changes are detected (i.e. when either
 +      rename or copy detection have been requested).
 +
  -m::
        This flag makes the merge commits show the full diff like
        regular commits; for each merge parent, a separate log entry