Thread (8 messages) flat view 8 messages, 4 authors, 2016-06-15

Re: git merge remote branch says "Merge commit ..."?

From: Johannes Sixt <hidden>
Date: 2016-06-15 22:46:48

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help