git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicolas Pitre <nico@cam.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Petr Baudis <pasky@suse.cz>, Shawn Pearce <spearce@spearce.org>,
	git@vger.kernel.org
Subject: Re: Git user survey and `git pull`
Date: Thu, 21 Sep 2006 14:05:11 -0400 (EDT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0609211357450.2627@xanadu.home> (raw)
In-Reply-To: <Pine.LNX.4.64.0609211027440.4388@g5.osdl.org>

On Thu, 21 Sep 2006, Linus Torvalds wrote:

> Right now, a plain "git pull" means "fetch all branches and merge the 
> first one", and the thing is, that's generally the right thing _only_ if 
> you pull into "master".
> 
> It's usually exactly the _wrong_ thing to do for any other branch. In 
> particular, if you work with a project that has lots of branches, and 
> you're working in another branch (that is directly tracking a remote, for 
> example), doing a "git pull" definitely should _not_ merge the first head. 
> It should fetch everything, and possibly merge the _matching_ head.
> 
> Which it doesn't do right now.

I think you're summarizing my grip about git pull quite well.  This is 
really counter-intuitive and I've been bitten by that behavior on many 
occasions.


Nicolas

  reply	other threads:[~2006-09-21 18:05 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-21 16:24 Git user survey and `git pull` Shawn Pearce
2006-09-21 16:40 ` Petr Baudis
2006-09-21 17:38   ` Linus Torvalds
2006-09-21 18:05     ` Nicolas Pitre [this message]
2006-09-22  4:57     ` Junio C Hamano
2006-09-22 10:34       ` Santi
2006-09-22 19:08         ` Junio C Hamano
2006-09-22 23:24           ` Santi
2006-09-21 17:02 ` Nicolas Pitre
2006-09-21 17:09   ` Shawn Pearce
2006-09-21 17:12   ` Johannes Schindelin
2006-09-21 17:17   ` Jakub Narebski
2006-09-22 21:05 ` Matthias Urlichs
2006-09-23 11:51   ` Alan Chandler
2006-09-23 14:12   ` Johannes Schindelin
2006-09-23  8:54 ` 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=Pine.LNX.4.64.0609211357450.2627@xanadu.home \
    --to=nico@cam.org \
    --cc=git@vger.kernel.org \
    --cc=pasky@suse.cz \
    --cc=spearce@spearce.org \
    --cc=torvalds@osdl.org \
    /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).