All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rene Herman <rene.herman@keyaccess.nl>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: David Symonds <dsymonds@gmail.com>, git <git@vger.kernel.org>
Subject: Re: "git pull . <branch>" versus "git merge <branch>"
Date: Wed, 11 Jun 2008 04:01:36 +0200	[thread overview]
Message-ID: <484F3200.2090800@keyaccess.nl> (raw)
In-Reply-To: <20080611015608.GD29404@genesis.frugalware.org>

On 11-06-08 03:56, Miklos Vajna wrote:

> On Wed, Jun 11, 2008 at 03:13:45AM +0200, Rene Herman
> <rene.herman@keyaccess.nl> wrote:

>> So in the case of merging a branch from the local repository into
>> the current branch, there is no difference between the two?
> 
> 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.

Thanks much, nice and clear! It might be good to adjust the git-pull 
manpage a bit if the merge is preferred? It sorts of sounds like its 
advertising the pull method now.

Regards,
Rene

  reply	other threads:[~2008-06-11  2:02 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 [this message]
2008-06-11  2:04       ` Paolo Bonzini
2008-06-11  2:09         ` Rene Herman
2008-06-11  5:23           ` Paolo Bonzini
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=484F3200.2090800@keyaccess.nl \
    --to=rene.herman@keyaccess.nl \
    --cc=dsymonds@gmail.com \
    --cc=git@vger.kernel.org \
    --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.