Re: What's cooking in git.git (Jul 2017, #03; Mon, 10)

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 13, 2017, 21:24 UTC
Message-ID: <xmqqr2xkt4ht.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170713204946.wfshkwpqoiwqgkft@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 10 quoted lines

> Sorry, I mean the case where you do a merge from the other side, but
> then you end up rewinding the history in some way, taking into account
> that merge and everything they did. For example:
>
>   $ git pull
>   $ git rebase  ;# this will flatten the merge
>   $ git push --force-with-lease
>
> There was never a moment where the other side's tip ref was in your
> local branch, but you did incorporate it via the merge.

Ah, OK, now it is clear what you meant.

Thanks.