From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 22 May 2009 18:30:34 GMT
Subject: Re: git merge remote branch says "Merge commit ..."?
Message-ID: <200905222030.34301.j6t@kdbg.org>
In-Reply-To: <20090522175401.GB11640@coredump.intra.peff.net>

On Freitag, 22. Mai 2009, Jeff King wrote:
> No, it is not terribly expensive. But you do have to talk to the server,
> which may mean making an ssh connection, or the server may be overloaded
> and slow. So it can take a few seconds instead of a few microseconds.

It's certainly doable without a remote connection with some digging in the 
configuration.

Git-gui has some magic to find out the remote when you request to merge a 
remote tracking branch. That is, even though you clickety-click through to do 
the equivalent of 'git merge origin/master', it comes up with a merge message 
that is the same as if you had said 'git pull origin master' on the command 
line. It doesn't need a connection to do that.

-- Hannes