From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:58:07 +0000 (+0900)
Subject: Merge branch 'ah/doc-updates' into maint
X-Git-Tag: v2.19.2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eba14167f1354a0bbe2c7ec44d37f5a950b6a2f7?hp=-c

Merge branch 'ah/doc-updates' into maint

Doc updates.

* ah/doc-updates:
doc: fix formatting in git-update-ref
doc: fix indentation of listing blocks in gitweb.conf.txt
doc: fix descripion for 'git tag --format'
doc: fix inappropriate monospace formatting
doc: fix ASCII art tab spacing
doc: clarify boundaries of 'git worktree list --porcelain'
---

eba14167f1354a0bbe2c7ec44d37f5a950b6a2f7
diff --combined Documentation/git-update-ref.txt
index fda8516677,86afd24c7f..9671423117
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/git-update-ref.txt
@@@ -8,7 -8,7 +8,7 @@@ git-update-ref - Update the object nam
  SYNOPSIS
  --------
  [verse]
 -'git update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])
 +'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])
  
  DESCRIPTION
  -----------
@@@ -129,8 -129,8 +129,8 @@@ a line to the log file "$GIT_DIR/logs/<
  symbolic refs before creating the log name) describing the change
  in ref value.  Log lines are formatted as:
  
-     . oldsha1 SP newsha1 SP committer LF
- +
+     oldsha1 SP newsha1 SP committer LF
+ 
  Where "oldsha1" is the 40 character hexadecimal value previously
  stored in <ref>, "newsha1" is the 40 character hexadecimal value of
  <newvalue> and "committer" is the committer's name, email address
@@@ -138,8 -138,8 +138,8 @@@ and date in the standard Git committer 
  
  Optionally with -m:
  
-     . oldsha1 SP newsha1 SP committer TAB message LF
- +
+     oldsha1 SP newsha1 SP committer TAB message LF
+ 
  Where all fields are as described above and "message" is the
  value supplied to the -m option.
  
diff --combined Documentation/git.txt
index 8e6a92e8ba,495b9163ea..254f063132
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -402,11 -402,11 +402,11 @@@ Git so take care if using a foreign fro
  	of Git object directories which can be used to search for Git
  	objects. New objects will not be written to these directories.
  +
- 	Entries that begin with `"` (double-quote) will be interpreted
- 	as C-style quoted paths, removing leading and trailing
- 	double-quotes and respecting backslash escapes. E.g., the value
- 	`"path-with-\"-and-:-in-it":vanilla-path` has two paths:
- 	`path-with-"-and-:-in-it` and `vanilla-path`.
+ Entries that begin with `"` (double-quote) will be interpreted
+ as C-style quoted paths, removing leading and trailing
+ double-quotes and respecting backslash escapes. E.g., the value
+ `"path-with-\"-and-:-in-it":vanilla-path` has two paths:
+ `path-with-"-and-:-in-it` and `vanilla-path`.
  
  `GIT_DIR`::
  	If the `GIT_DIR` environment variable is set then it
@@@ -599,8 -599,8 +599,8 @@@ trace messages into this file descripto
  +
  Alternatively, if the variable is set to an absolute path
  (starting with a '/' character), Git will interpret this
 -as a file path and will try to write the trace messages
 -into it.
 +as a file path and will try to append the trace messages
 +to it.
  +
  Unsetting the variable, or setting it to empty, "0" or
  "false" (case insensitive) disables trace messages.
@@@ -858,9 -858,7 +858,9 @@@ Reporting Bug
  
  Report bugs to the Git mailing list <git@vger.kernel.org> where the
  development and maintenance is primarily done.  You do not have to be
 -subscribed to the list to send a message there.
 +subscribed to the list to send a message there.  See the list archive
 +at https://public-inbox.org/git for previous bug reports and other
 +discussions.
  
  Issues which are security relevant should be disclosed privately to
  the Git Security mailing list <git-security@googlegroups.com>.