aboutsummaryrefslogtreecommitdiff
path: root/Documentation/fetch-options.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 16:31:20 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-03 09:19:04 -0700
commit0e615b252f35006ea824fae1a95dc6af55326b9a (patch)
tree81a66d2d1561c3310e4dd8cab7ac2869c3601371 /Documentation/fetch-options.txt
parent8009d83c7e7af0a298ef858609a8201d01086396 (diff)
downloadgit-0e615b252f35006ea824fae1a95dc6af55326b9a.tar.gz
git-0e615b252f35006ea824fae1a95dc6af55326b9a.tar.xz
Replace "remote tracking" with "remote-tracking"
"remote-tracking" branch makes it explicit that the branch is "tracking a remote", as opposed to "remote, and tracking something". See discussion in e.g. http://mid.gmane.org/8835ADF9-45E5-4A26-9F7F-A72ECC065BB2@gmail.com for more details. This patch is a straightforward application of perl -pi -e 's/remote tracking branch/remote-tracking branch/' except in the RelNotes directory. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/fetch-options.txt')
-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 470ac3139..a435c2313 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -36,7 +36,7 @@ ifndef::git-pull[]
-p::
--prune::
- After fetching, remove any remote tracking branches which
+ After fetching, remove any remote-tracking branches which
no longer exist on the remote.
endif::git-pull[]