Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/fetch-prune-doc'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Jun 2016 16:56:44 +0000
(09:56 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Jun 2016 16:56:44 +0000
(09:56 -0700)
* jk/fetch-prune-doc:
fetch: document that pruning happens before fetching
Documentation/fetch-options.txt
patch
|
blob
|
history
raw
(from parent 1:
0c068af
)
diff --git
a/Documentation/fetch-options.txt
b/Documentation/fetch-options.txt
index 036edfb099c367262f34d2c1275ac5079a1e0914..b05a8341e82f7ff3a1e07a0f6b691292cc9c5e68 100644
(file)
--- 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