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

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

From: Eric Raible <hidden>
Date: 2016-06-15 22:46:48

Jeff King <peff <at> peff.net> writes:
I think doing a "git merge origin/master" is perfectly normal for some
workflows. For example:

  $ git fetch origin ;# grab it
  $ gitk origin/master...master ;# check if it is good to merge
  $ git merge origin/master ;# and merge it

The final step _could_ be a pull, but there is no point in repeating the
fetch (which might be costly).
My understanding is that if the objects already exist
locally then this is not going to be costly at all.
The negotiation of what is needed is cheap, isn't it?

- Eric
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help