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
--
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