From: "J. Bruce Fields" <bfields@fieldses•org>
To: Andreas Ericsson <ae@op5•se>
Cc: Steffen Prohaska <prohaska@zib•de>,
Jakub Narebski <jnareb@gmail•com>, Sergei Organov <osv@javad•com>,
git@vger•kernel.org
Subject: Re: [Newbie] How to *actually* get rid of remote tracking branch?
Date: Tue, 13 Nov 2007 18:05:05 -0500 [thread overview]
Message-ID: <20071113230505.GJ22590@fieldses.org> (raw)
In-Reply-To: <473A262B.4010205@op5.se>
On Tue, Nov 13, 2007 at 11:33:15PM +0100, Andreas Ericsson wrote:
> Andreas Ericsson wrote:
>> Steffen Prohaska wrote:
>>>
>>> BTW, what's the right name for this type of branch.
>>> I found "tracking branch", "remote tracking branch", and
>>> "remote-tracking branch" in the manual. The glossary only
>>> mentions "tracking branch". Or is it a "tracked remote branch"
>>> as the output of "git remote show" suggests. I remember,
>>> there was a lengthy discussion on this issue. Does someone
>>> remember the conclusion?
>>>
>>
>> It seems we agreed to disagree. However, a "tracked remote branch"
>> is definitely not in your local repo. I think remote-tracking branch
>> grammatically is the most correct, as that's the only non-ambiguous
>> form (remote tracking branch might mean "remote tracking-branch" or
>> "remote-tracking branch"). It's also the only form that works when
>> used with "local" in front of it. "Tracked remote branch" will
>> always be a "remote branch", no matter how you prefix it.
>>
>> I hate that part of git nomenclature with a passion. It's ambiguous
>> at best and, as a consequence, downright wrong for some uses.
>>
>
> I confess myself corrected. The Documentation/glossary.txt file doesn't
> mention them at all. It does however describe "tracking branch", and
> mentions "Pull: " refspecs in the same sentence, indicating that that
> particular description is a leftover from the pre-1.5 era.
>
> I've got half a patch ready to change all occurrences of anything but
> "remote-tracking branch" to that self-same description. This is what
> I've got in Documentation/glossary.txt so far:
>
> [[def_remote_tracking_branch]]remote-tracking branch:
> A "remote-tracking branch" is a branch set up to track the
> state of a branch in a remote repository which the user has named.
> These branches follow exactly the same rules as the branches which
> reside in the remote repository, except that they are manipulated
> by `git fetch` instead of `git push`. That is, they can only be
> updated if the update would result in a <<def_fastforward,fast
> forward>>, or if the user supplies the '--force' option.
This is a little confusing--by default fetch does force updates.
--b.
> They cannot
> be checked out or committed to by users, but serve
> solely as local reference-pointers to their corresponding branches
> in the remote repository.
> The most common example of a remote-tracking branch is origin/master.
>
>
> It's a bit long-winded. Anyone got any improvements?
>
> --
> Andreas Ericsson andreas.ericsson@op5•se
> OP5 AB www.op5.se
> Tel: +46 8-230225 Fax: +46 8-230231
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger•kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2007-11-13 23:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-13 14:25 [Newbie] How to *actually* get rid of remote tracking branch? Sergei Organov
2007-11-13 14:53 ` Jakub Narebski
2007-11-13 15:39 ` Sergei Organov
2007-11-13 16:01 ` Johannes Schindelin
2007-11-13 17:31 ` Sergei Organov
2007-11-13 18:21 ` Johannes Schindelin
2007-11-13 18:44 ` Sergei Organov
2007-11-17 16:56 ` Jan Hudec
2007-11-13 16:03 ` Jakub Narebski
2007-11-13 17:16 ` Steffen Prohaska
2007-11-13 17:42 ` Jakub Narebski
2007-11-13 17:58 ` osv
2007-11-13 18:17 ` Lars Hjemli
2007-11-13 18:59 ` Sergei Organov
2007-11-13 18:39 ` Steffen Prohaska
2007-11-17 19:12 ` Jan Hudec
2007-11-17 19:51 ` [PATCH] Improve description of git-branch -d and -D in man page Jan Hudec
2007-11-19 9:49 ` Sergei Organov
2007-11-13 17:47 ` [Newbie] How to *actually* get rid of remote tracking branch? Sergei Organov
2007-11-13 20:01 ` Andreas Ericsson
2007-11-13 22:33 ` Andreas Ericsson
2007-11-13 22:42 ` Jakub Narebski
2007-11-13 23:05 ` J. Bruce Fields [this message]
2007-11-13 23:56 ` Junio C Hamano
2007-11-14 1:02 ` Andreas Ericsson
2007-11-14 5:48 ` Steffen Prohaska
2007-11-13 17:40 ` Sergei Organov
2007-11-13 19:17 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071113230505.GJ22590@fieldses.org \
--to=bfields@fieldses$(echo .)org \
--cc=ae@op5$(echo .)se \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=osv@javad$(echo .)com \
--cc=prohaska@zib$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox