Merge branch 'maint'

* maint:
git fetch documentation: describe short '-p' synonym to '--prune' option
format-patch: document the format.to configuration setting

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 72949e71ac0996c3a6af7ff98c4de5bb4a457625..79d54e546a7823eb7b9da2a1fc99961a26123f63 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -886,9 +886,11 @@ format.headers::
        Additional email headers to include in a patch to be submitted
        by mail.  See linkgit:git-format-patch[1].
 
+format.to::
 format.cc::
-       Additional "Cc:" headers to include in a patch to be submitted
-       by mail.  See the --cc option in linkgit:git-format-patch[1].
+       Additional recipients to include in a patch to be submitted
+       by mail.  See the --to and --cc options in
+       linkgit:git-format-patch[1].
 
 format.subjectprefix::
        The default for format-patch is to output files with the '[PATCH]'

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 044ec882ccf9f8437862a5e59a3caee7030c36ae..9333c42c558464ce2430df39e9864f932e786b36 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -34,6 +34,7 @@ ifndef::git-pull[]
        Allow several <repository> and <group> arguments to be
        specified. No <refspec>s may be specified.
 
+-p::
 --prune::
        After fetching, remove any remote tracking branches which
        no longer exist on the remote.