Merge branch 'mm/doc-tt' into maint

More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.

* mm/doc-tt:
doc: typeset HEAD and variants as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset long options with argument as literal
doc: typeset '--' as literal
doc: typeset long command-line options as literal
doc: typeset short command-line options as literal
Documentation/git-mv.txt: fix whitespace indentation

diff --cc Documentation/config.txt
index 4f41840fdc0fed4ad5cf469032c7f76811dd61f0,982b62009cc7de3cc38a46afa59df25d76d97f20..6ad3eb66df092928bfad661bfbee37aa4e98dda1
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1956,10 -1916,7 +1956,10 @@@ log.decorate:
        command. If 'short' is specified, the ref name prefixes 'refs/heads/',
        'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
        specified, the full ref name (including prefix) will be printed.
 -      This is the same as the log commands `--decorate` option.
 +      If 'auto' is specified, then if the output is going to a terminal,
 +      the ref names are shown as if 'short' were given, otherwise no ref
-       names are shown. This is the same as the '--decorate' option
++      names are shown. This is the same as the `--decorate` option
 +      of the `git log`.
  
  log.follow::
        If `true`, `git log` will act as if the `--follow` option was used when

diff --cc Documentation/diff-config.txt
index f1101c7b218877247067ae282398594e2410ebed,0ddb7a6b4c022631fce876e52572fe7d93fd6aa2..d5a5b17d508839bc379821ee1a318400a3557fe9
--- 1/Documentation/diff-config.txt
--- 2/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@@ -105,16 -105,12 +105,16 @@@ diff.orderFile:
  
  diff.renameLimit::
        The number of files to consider when performing the copy/rename
-       detection; equivalent to the 'git diff' option '-l'.
+       detection; equivalent to the 'git diff' option `-l`.
  
  diff.renames::
 -      Tells Git to detect renames.  If set to any boolean value, it
 -      will enable basic rename detection.  If set to "copies" or
 -      "copy", it will detect copies, as well.
 +      Whether and how Git detects renames.  If set to "false",
 +      rename detection is disabled. If set to "true", basic rename
 +      detection is enabled.  If set to "copies" or "copy", Git will
 +      detect copies, as well.  Defaults to true.  Note that this
 +      affects only 'git diff' Porcelain like linkgit:git-diff[1] and
 +      linkgit:git-log[1], and not lower level commands such as
 +      linkgit:git-diff-files[1].
  
  diff.suppressBlankEmpty::
        A boolean to inhibit the standard behavior of printing a space

diff --cc Documentation/fetch-options.txt
Simple merge

diff --cc Documentation/git-cherry-pick.txt
Simple merge

diff --cc Documentation/git-commit-tree.txt
Simple merge

diff --cc Documentation/git-commit.txt
Simple merge

diff --cc Documentation/git-p4.txt
Simple merge

diff --cc Documentation/git-rebase.txt
Simple merge

diff --cc Documentation/git-send-email.txt
Simple merge

diff --cc Documentation/git-svn.txt
Simple merge

diff --cc Documentation/git-tag.txt
Simple merge

diff --cc Documentation/git.txt
Simple merge