git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Vaclav Hanzl <hanzl@noel.feld.cvut.cz>
Cc: lewiemann@gmail.com, jnareb@gmail.com, peff@peff.net,
	git@vger.kernel.org
Subject: Re: Document clone of clone loosing branches?
Date: Sat, 14 Jun 2008 15:18:08 -0700	[thread overview]
Message-ID: <7vr6azfyov.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080614.233645.71097102.hanzl@noel.feld.cvut.cz> (Vaclav Hanzl's message of "Sat, 14 Jun 2008 23:36:45 +0200 (CEST)")

Vaclav Hanzl <hanzl@noel.feld.cvut.cz> writes:

> I am not sure that the term 'branch' can be reasonably expected to
> mean 'regular branch' unless specified otherwise. For example, 'man
> git' says:
>
>        git-branch(1)
>           List, create, or delete branches.
>
> It can also list remote-tracking branches, cannot it? Or:
>
>        git-show-branch(1)
>           Show branches and their commits.
>
> Can also show remote-tracking branches, cannot it?

These fall into "quibbling" category, but that judgement can only be made
by people who know the history.

Updates to glossary and other introductory documents might be necessary.
For example, the entry about "tracking branch" in the glossary still talks
about the ancient convention of copying 'master' to 'origin' as a regular
branch:

    [[def_tracking_branch]]tracking branch::
            A regular git <<def_branch,branch>> that is used to follow changes from
            another <<def_repository,repository>>. A tracking
            branch should not contain direct modifications or have local commits
            made to it. A tracking branch can usually be
            identified as the right-hand-side <<def_ref,ref>> in a Pull:
            <<def_refspec,refspec>>.

This does _not_ reflect post v1.3.0 reality at all.  No git more recent
than Apr 2006 has used a "regular git branch" for tracking.

It probably is enough to say:

        A ref that is used to follow changes from another repository.
	In modern git, they are found in `refs/remotes/` hierarchy.

because you cannot add "direct modifications or have local commits" to
them anymore.

  reply	other threads:[~2008-06-14 22:19 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-14 13:05 Document clone of clone loosing branches? Vaclav Hanzl
2008-06-14 14:31 ` Jeff King
2008-06-14 20:15   ` Document clone of clone ... bug?? Vaclav Hanzl
2008-06-14 20:34     ` Jakub Narebski
2008-06-14 20:48       ` Vaclav Hanzl
2008-06-14 14:31 ` Document clone of clone loosing branches? Jakub Narebski
2008-06-14 14:44 ` Lea Wiemann
2008-06-14 21:36   ` Vaclav Hanzl
2008-06-14 22:18     ` Junio C Hamano [this message]
2008-06-15  7:18       ` Vaclav Hanzl
2008-06-14 23:03     ` Jakub Narebski
2008-06-15  8:40 ` Jakub Narebski
2008-06-15 13:05   ` [PATCH] Documentation: Note about the meaning of "clone" Robin Rosenberg
2008-06-15 13:39     ` Jakub Narebski
2008-06-15 13:52     ` Wincent Colaiuta
2008-06-15 16:31       ` Vaclav Hanzl
2008-06-15 17:03     ` Vaclav Hanzl
2008-06-15 19:12     ` Miklos Vajna
2008-06-15 20:14     ` Junio C Hamano
2008-06-15 13:05   ` PATCH] cvsimport: Clarification on the use of -r Robin Rosenberg

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=7vr6azfyov.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=hanzl@noel.feld.cvut.cz \
    --cc=jnareb@gmail.com \
    --cc=lewiemann@gmail.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).