git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Aghiles <aghilesk@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	Sverre Rabbelier <srabbelier@gmail.com>,
	git list <git@vger.kernel.org>
Subject: Re: git pull behavior changed?
Date: Wed, 21 Apr 2010 20:41:37 -0400	[thread overview]
Message-ID: <20100422004136.GA18570@coredump.intra.peff.net> (raw)
In-Reply-To: <k2t3abd05a91004211713u24ff93f3of758e5e09c7b8059@mail.gmail.com>

On Wed, Apr 21, 2010 at 08:13:48PM -0400, Aghiles wrote:

> I don't have the information handy but it was most probably pre-1.5.
> I don't know if my 'branching habits' are common, but I found that
> the old behavior to be more natural with the way we work (creating
> branches for quick parallel work).

OK, then the behavior did change for you. But you are probably about 3
years too late to complain and try to get it changed. :)

> If the current behavior is here to stay, I would humbly suggest to
> mention the 'git checkout -b x origin' syntax in the manual (and
> 'git branch --track x origin').

It is in the checkout manual, but I think the subtlety that you missed
is that "--track" is going to care about whether you start your branch
from your local "master" or the remote "master". Even if they're at the
same commit, you are interested conceptually in basing your work on what
the remote is doing. Maybe we could talk about this in the definition of
<start-point>, I guess.

You may also be interested to know that "git checkout foo" these days
when you have no "foo" branch will do the equivalent of "git checkout -b
--track foo origin/foo", which would also do what you want.

-Peff

  reply	other threads:[~2010-04-22  0:42 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-21 21:13 git pull behavior changed? Aghiles
2010-04-21 21:22 ` Sverre Rabbelier
2010-04-21 21:34   ` Aghiles
2010-04-21 21:55   ` Aghiles
2010-04-21 21:59     ` Sverre Rabbelier
2010-04-21 21:59     ` Matthieu Moy
2010-04-21 22:04       ` Aghiles
2010-04-21 22:23         ` Matthieu Moy
2010-04-21 22:41           ` Aghiles
2010-04-22  0:01             ` Jeff King
2010-04-22  0:13               ` Aghiles
2010-04-22  0:41                 ` Jeff King [this message]
2010-04-22  1:27                   ` Aghiles
2010-04-22  2:10                     ` Jeff King
2010-04-21 23:27         ` Randal L. Schwartz
2010-04-21 23:57           ` Aghiles
2010-04-22  8:10             ` Petr Baudis
2010-04-22  8:16               ` Junio C Hamano
2010-04-22 11:49                 ` Creating tracked branches Petr Baudis
2010-04-22 13:47                   ` Andreas Schwab
2010-04-22 14:17                     ` Petr Baudis
2010-04-22 21:13                 ` git pull behavior changed? Aghiles

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=20100422004136.GA18570@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=aghilesk@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=srabbelier@gmail.com \
    /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).