From: nicolas.pouillard@gmail.com (Nicolas Pouillard)
Subject: [sup-talk] [PATCH] Allow multi_edit_labels to remove labels using -lab (the "; l" key binding)
Date: Mon, 23 Mar 2009 11:26:23 +0100 [thread overview]
Message-ID: <1237803829-sup-8994@ausone.inria.fr> (raw)
In-Reply-To: <1237756617-sup-7606@entry>
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: <http://rubyforge.org/pipermail/sup-talk/attachments/20090323/aa8a4b3b/attachment.obj>
-------------- 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: <http://rubyforge.org/pipermail/sup-talk/attachments/20090323/aa8a4b3b/attachment-0001.obj>
next prev parent reply other threads:[~2009-03-23 10:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-16 18:35 Nicolas Pouillard
2009-03-18 15:33 ` Nicolas Pouillard
2009-03-22 21:21 ` William Morgan
2009-03-23 10:26 ` Nicolas Pouillard [this message]
2009-03-23 14:49 ` William Morgan
2009-03-23 15:18 ` Nicolas Pouillard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1237803829-sup-8994@ausone.inria.fr \
--to=nicolas.pouillard@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox