Re: "git pull . <branch>" versus "git merge <branch>"
- From
- Rene Herman <rene.herman@keyaccess.nl>
- Date
- Jun 11, 2008, 01:13 UTC
- Message-ID
- <484F26C9.9080608@keyaccess.nl>
- In-Reply-To
- <ee77f5c20806101806u6dc04152rb8307eb12a6167c@mail.gmail.com>
On 11-06-08 03:06, David Symonds wrote:
Show 8 quoted lines
> On Wed, Jun 11, 2008 at 10:51 AM, Rene Herman <rene.herman@keyaccess.nl> wrote: > >> 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? > > git pull also does a fetch in it's usual mode of operation, and runs > git merge to do merge changes in the remote-tracking branches.
So in the case of merging a branch from the local repository into the current branch, there is no difference between the two?
Rene.