From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.pouillard@gmail.com (Nicolas Pouillard) Date: Mon, 23 Mar 2009 11:26:23 +0100 Subject: [sup-talk] [PATCH] Allow multi_edit_labels to remove labels using -lab (the "; l" key binding) In-Reply-To: <1237756617-sup-7606@entry> References: <1237228536-sup-7811@ausone.local> <1237390328-sup-1506@ausone.local> <1237756617-sup-7606@entry> Message-ID: <1237803829-sup-8994@ausone.inria.fr> Excerpts from William Morgan's message of Sun Mar 22 22:21:46 +0100 2009: > Reformatted excerpts from nicolas.pouillard's message of 2009-03-18: > > This patch conflict with the undo feature, I've locally resolved the > > merge. However I don't really know what the best way to share the > > conflict resolution. > > That's a good question. For some reason git format-patch doesn't produce > anything for merge commits, even if they contain conflict resolution > changes. Maybe it's for a good reason; I don't know. > > But you can use git diff. After merging and resolving the conflict, if > you do "git diff HEAD^", that should output the conflict-resolution > changes. You can send that to me and I can use it to replicate the > commit. I've applied the resolution in a local branch, a attach to patches. The first is done with 'git diff' before commit the conflict resolution. The second is done with 'git diff HEAD^' just after. -- Nicolas Pouillard -------------- next part -------------- A non-text attachment was scrubbed... Name: undo+multi_edit_labels+remove.patch Type: application/octet-stream Size: 1901 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: undo+multi_edit_labels+remove2.patch Type: application/octet-stream Size: 1861 bytes Desc: not available URL: