summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:44 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:44 -0700
commit1c22105f2ce6795035f4d030325127dab9736caa (patch)
treec2b5aa110206bc0cdd2ff9e855ad0d5dd0be13d2
parent9d3d0dbb14fa529492d828485b1f65aa9e0ed199 (diff)
parent9e70233a17f158f499c60ff82c20c7646fde66e8 (diff)
downloadgit-1c22105f2ce6795035f4d030325127dab9736caa.tar.gz
Merge branch 'jk/fetch-prune-doc' into maint
Minor doc update. * jk/fetch-prune-doc: fetch: document that pruning happens before fetching
-rw-r--r--Documentation/fetch-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 036edfb099..b05a8341e8 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -52,7 +52,7 @@ ifndef::git-pull[]
-p::
--prune::
- After fetching, remove any remote-tracking references that no
+ Before fetching, remove any remote-tracking references that no
longer exist on the remote. Tags are not subject to pruning
if they are fetched only because of the default tag
auto-following or due to a --tags option. However, if tags