summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-07-13 09:14:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-13 09:14:35 -0700
commit449aeb10d5d28083199f82c444b55a03c545e956 (patch)
tree76f491a8574e9a199a47ba3975fd181a4ace677a
parenttest-lib: TAP compliance for skipping tests on request (diff)
parentgit fetch documentation: describe short '-p' synonym to '--prune' option (diff)
downloadtgif-449aeb10d5d28083199f82c444b55a03c545e956.tar.xz
Merge branch 'maint'
* maint: git fetch documentation: describe short '-p' synonym to '--prune' option format-patch: document the format.to configuration setting
-rw-r--r--Documentation/config.txt6
-rw-r--r--Documentation/fetch-options.txt1
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 72949e71ac..79d54e546a 100644
--- 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 044ec882cc..9333c42c55 100644
--- 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.