From: Matteo Cypriani <mcy@lm7.fr>
To: git@vger.kernel.org
Subject: Re: Preserve merge changes with rebase -p
Date: Tue, 21 Jun 2011 17:07:49 +0200 [thread overview]
Message-ID: <201106211707.53486.mcy@lm7.fr> (raw)
In-Reply-To: <4E00AE60.5000801@sohovfx.com>
[-- Attachment #1: Type: Text/Plain, Size: 849 bytes --]
Le mardi 21 juin 2011 16:44:48, Andrew Wong a écrit :
> Unfortunately, I don't think there's any nice way to do it right now. I
> think what you could do for now is make the "pick <M>" into a "edit
> <M>", together with other changes you want to make. And then when you
> get to "edit M", do a "git cherry-pick -n -m 1 <M>", or "-m 2" depending
> on how your merge was done. That should bring your changes over. Then
> you just need resolve and add any conflicts, and do a "rebase --continue".
Thank you, I'll try that the next time.
> I imagine this is pretty useful feature to have too. I could look into
> adding this support when I got a chance.
That would be great, many thanks in advance!
Cheers,
Matteo
--
Ma clef GPG est disponible sur keyserver.veridis.com
My GPG key is available on keyserver.veridis.com
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2011-06-21 15:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-21 12:11 Preserve merge changes with rebase -p Matteo Cypriani
2011-06-21 14:44 ` Andrew Wong
2011-06-21 15:07 ` Matteo Cypriani [this message]
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=201106211707.53486.mcy@lm7.fr \
--to=mcy@lm7.fr \
--cc=git@vger.kernel.org \
/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