On Wed, Sep 04, 2013 at 03:59:18PM -0700, Junio C Hamano wrote:
> Are there cases where you do not want to either rebase nor merge?
> If so what do you want to do after "git pull" fetches from the other
> side?  Nothing?

One other thing that I can see being useful occasionally is:

    git rebase @{u}@{1} --onto @{u}

which allows local commits to be replayed onto a rewritten upstream

Although I agree with your side note below that people doing this may be
better off fetching and then updating their local branch, particularly
if @{1} is not the correct reflog entry for the upstream when they
created the branch.

>       Side note: a knee-jerk response to a "yes" answer to the
>       last question from me has always been "then why are you
>       running 'git pull' in the first place. The next paragraph is
>       my attempt to extend my imagination a bit, stepping outside
>       that reaction.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to