[cairo] Device offset rework status, and what it needs from here

Carl Worth cworth at cworth.org
Fri May 5 14:07:11 PDT 2006

On Fri, 05 May 2006 23:07:10 +0200, Christian Biesinger wrote:
> There were some conflicts here, but at least this taught me the right 
> way to resolve conflicts from git rebase ;)
> The answer is: Resolve conflicts, git update-index filename, then to 
> continue (no need for an explicit commit):
>    git am --binary -3 -k --resolved

Which is one of the more grotty pieces of git interface around. Just
FYI there's a patch on the git list that adds something like "git
rebase --continue" for this operation, (as well as something like "git
rebase --abort").

So those will certainly be a nice improvement.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.freedesktop.org/archives/cairo/attachments/20060505/059c256b/attachment.pgp

More information about the cairo mailing list