summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8009d83)
raw | patch | inline | side by side (parent: 8009d83)
author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
Tue, 2 Nov 2010 15:31:20 +0000 (16:31 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 3 Nov 2010 16:19:04 +0000 (09:19 -0700) |
"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>
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>
index 538ebb5e2ecc58f1ddcb7adb44ded3b027555ec2..e625d6a85b69c2c079fec99983fc8f1f654c494c 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
color.decorate.<slot>::
Use customized color for 'git log --decorate' output. `<slot>` is one
of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
- branches, remote tracking branches, tags, stash and HEAD, respectively.
+ branches, remote-tracking branches, tags, stash and HEAD, respectively.
color.grep::
When set to `always`, always highlight matches. When `false` (or
index 470ac31396606a18298f69329b050a86943c580c..a435c23138a6c85bedb83e7df3286575fe2bbe6e 100644 (file)
-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[]
index 6d40f0011b0fd297e5676c8479e46989d7f47696..ff41784c60b04a276931fc90ab54a22a67024a1e 100644 (file)
git log --branches --not --remotes=origin::
Shows all commits that are in any of local branches but not in
- any of remote tracking branches for 'origin' (what you have that
+ any of remote-tracking branches for 'origin' (what you have that
origin doesn't).
git log master --not --remotes=*/master::
index c50f7dcb890139d829bae51c30b513d54fd7761e..33e8438880e52059f12b26132fe30ddce88bfeeb 100644 (file)
<repository> should be the name of a remote repository as
passed to linkgit:git-fetch[1]. <refspec> can name an
arbitrary remote ref (for example, the name of a tag) or even
-a collection of refs with corresponding remote tracking branches
+a collection of refs with corresponding remote-tracking branches
(e.g., refs/heads/*:refs/remotes/origin/*), but usually it is
the name of a branch in the remote repository.
index 0d28febe1b44fff289b772a0e0fb6e74a010b9eb..5e4989db56e7e2664a0141c3d9ffa1b3e0524185 100644 (file)
'rename'::
-Rename the remote named <old> to <new>. All remote tracking branches and
+Rename the remote named <old> to <new>. All remote-tracking branches and
configuration settings for the remote are updated.
+
In case <old> and <new> are the same, and <old> is a file under
'rm'::
-Remove the remote named <name>. All remote tracking branches and
+Remove the remote named <name>. All remote-tracking branches and
configuration settings for the remote are removed.
'set-head'::
index 1c1606696e3771f1b881c18689b049b53a8a3539..f1f4086389445a44645e57c2340cc94266f92835 100644 (file)
Unlike the longhand form, when Alice fetches from Bob using a
remote repository shorthand set up with 'git remote', what was
-fetched is stored in a remote tracking branch, in this case
+fetched is stored in a remote-tracking branch, in this case
`bob/master`. So after this:
-------------------------------------
index 7a42567060bc4c79e5eef00e4cc01a90c9ab39a4..7a1b164ccdd7ff1c9297ead7671a552bc18a3e89 100644 (file)
Pretend as if all the refs in `refs/remotes` are listed
on the command line as '<commit>'. If '<pattern>' is given, limit
- remote tracking branches to ones matching given shell glob.
+ remote-tracking branches to ones matching given shell glob.
If pattern lacks '?', '*', or '[', '/*' at the end is implied.
--glob=<glob-pattern>::
index fc56da677cb0ed3d9243bfb928686b60df213243..d5505e88018d7e59f66ec8cee94b77adca2469ac 100644 (file)
into your own work.
We have already seen <<Updating-a-repository-With-git-fetch,how to
-keep remote tracking branches up to date>> with linkgit:git-fetch[1],
+keep remote-tracking branches up to date>> with linkgit:git-fetch[1],
and how to merge two branches. So you can merge in changes from the
original repository's master branch with:
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 9240fafb2ad17505bf407363e058d208a8a70497..9a934af74bce0983528cc29af5e73a812d7af417 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
* With no paths, if <something> is _not_ a commit, no -t nor -b
* was given, and there is a tracking branch whose name is
* <something> in one and only one remote, then this is a short-hand
- * to fork local <something> from that remote tracking branch.
+ * to fork local <something> from that remote-tracking branch.
*
* Otherwise <something> shall not be ambiguous.
* - If it's *only* a reference, treat it like case (1).
diff --git a/t/t5513-fetch-track.sh b/t/t5513-fetch-track.sh
index 9e7486274b3f0079cb993acbd03e90afc5638e38..65d1e05bd62af9c2b6dfa6cdd841d03622bf94ac 100755 (executable)
--- a/t/t5513-fetch-track.sh
+++ b/t/t5513-fetch-track.sh
#!/bin/sh
-test_description='fetch follows remote tracking branches correctly'
+test_description='fetch follows remote-tracking branches correctly'
. ./test-lib.sh