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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html