On 11/14/05, Junio C Hamano [off-list ref] wrote:
In your message you indicated that you use "format-patch" piped
to "am". I think that is a better approach than "rebase" these
days
Hmmm. But doesn't deal well with binary changes. We deal with a large
set of projects, and while we don't manage that many binary files, it
is just enough that I'll have to pass on only using format-patch.
This was recently added by Linus to help git-merge do that:
git-read-tree --trivial -m -u $O $A $B
Cool! Abusing that, perhaps I could teach git-rebase to take a
'--trivial-only' flag, and then cg-update --rebase could try
git-rebase --trivial-only, and fall back on cg-merge...
cheers,
martin