Re: equal-tree-merges as way to make rebases fast-forward-able

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 30, 2009, 17:19 UTC
Message-ID: <alpine.DEB.1.00.0911301815390.4985@pacific.mpi-cbg.de>
In-Reply-To: <cover.1259524136.git.brlink@debian.org>

Hi,

On Mon, 30 Nov 2009, Bernhard R. Link wrote:

> The itch this idea is supposed to scratch is the problem that a rebase 
> or a amended commit is no longer a fast-forward, so cannot be easily 
> pulled.

Actually, I did something like this without any new tool:

	git rebase origin/master
	git merge -s ours master@{1}

The effect is that there is a merge commit which really merges the old state.

OTOH I can see that there is merit in trying to avoid to _require_ the whole history of the rebased branch. But then, would it not be more in line with Git's ideas if there was a tool trying to identify, say, from the commit message which commits in HEAD...MERGE_HEAD are supposed to be identical?

Ciao, Dscho