From: Paolo Bonzini <bonzini@gnu.org>
To: Rene Herman <rene.herman@keyaccess.nl>
Cc: Miklos Vajna <vmiklos@frugalware.org>,
David Symonds <dsymonds@gmail.com>, git <git@vger.kernel.org>
Subject: Re: "git pull . <branch>" versus "git merge <branch>"
Date: Tue, 10 Jun 2008 22:23:46 -0700 [thread overview]
Message-ID: <484F6162.6060606@gnu.org> (raw)
In-Reply-To: <484F33E9.1060205@keyaccess.nl>
>>> There is no difference, but you really want to use git merge and not git
>>> pull in such a case, I guess the git pull form is supported mainly to
>>> keep backwards compatibility.
>>
>> However, when you're on a tracking merge
>
> On a what? :)
Tracking *branch*, sorry. A branch that has configuration options like
[branch "foo"]
remote = origin
merge = next
so that git knows that, when you're on branch foo, "git pull" is
actually equivalent to "git pull origin next:foo".
Paolo
next prev parent reply other threads:[~2008-06-11 5:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-11 0:51 "git pull . <branch>" versus "git merge <branch>" Rene Herman
2008-06-11 1:06 ` David Symonds
2008-06-11 1:13 ` Rene Herman
2008-06-11 1:56 ` Miklos Vajna
2008-06-11 2:01 ` Rene Herman
2008-06-11 2:04 ` Paolo Bonzini
2008-06-11 2:09 ` Rene Herman
2008-06-11 5:23 ` Paolo Bonzini [this message]
2008-06-11 17:56 ` Daniel Barkalow
2008-06-11 18:32 ` Brandon Casey
2008-06-11 19:46 ` Daniel Barkalow
2008-06-11 21:01 ` Brandon Casey
2008-06-11 21:49 ` Mikael Magnusson
2008-06-12 0:56 ` Rene Herman
2008-06-11 23:01 ` Junio C Hamano
2008-06-12 1:00 ` Rene Herman
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=484F6162.6060606@gnu.org \
--to=bonzini@gnu.org \
--cc=dsymonds@gmail.com \
--cc=git@vger.kernel.org \
--cc=rene.herman@keyaccess.nl \
--cc=vmiklos@frugalware.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.