From: Junio C Hamano <gitster@pobox.com>
To: Rene Herman <rene.herman@keyaccess.nl>
Cc: git <git@vger.kernel.org>
Subject: Re: "git pull . <branch>" versus "git merge <branch>"
Date: Wed, 11 Jun 2008 16:01:52 -0700 [thread overview]
Message-ID: <7v3anjbmov.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <484F2174.9020508@keyaccess.nl> (Rene Herman's message of "Wed, 11 Jun 2008 02:51:00 +0200")
Rene Herman <rene.herman@keyaccess.nl> writes:
> Good day.
>
> The manpages seem to be making somewhat of a point of mentioning "git
> pull . <branch>" as the way to merge a local branch into the current
> one but a simple "git merge <branch>" seems to work well. Is there a
> difference?
There isn't any.
"git pull . this_branch" is just a natural and logical consequence that
you can fetch and merge a branch B from remote U with "git pull $U $B".
"git merge that_branch" exists and useful because people on average merge
local branches more than they fetch and merge from remote repository.
next prev parent reply other threads:[~2008-06-11 23:03 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
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 [this message]
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=7v3anjbmov.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rene.herman@keyaccess.nl \
/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).