From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: martin f krafft <madduck@madduck.net>
Cc: git discussion list <git@vger.kernel.org>
Subject: Re: unmerging feature branches
Date: Tue, 23 Oct 2007 18:19:42 +0200 [thread overview]
Message-ID: <vpqejflolb5.fsf@bauges.imag.fr> (raw)
In-Reply-To: <20071023152445.GA10070@piper.oerlikon.madduck.net> (martin f. krafft's message of "Tue\, 23 Oct 2007 17\:24\:45 +0200")
martin f krafft <madduck@madduck.net> writes:
> Now I woul like to undo the merge.
Dirty solution: export the patch corresponding to the merge (diff
M..M^), and apply it on master. If you have no conflicts, it should be
doable. If you have conflicts, it will probably be painfull.
--
Matthieu
next prev parent reply other threads:[~2007-10-23 16:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-23 15:24 unmerging feature branches martin f krafft
2007-10-23 16:19 ` Matthieu Moy [this message]
2007-10-23 16:50 ` Linus Torvalds
2007-10-23 17:16 ` martin f krafft
2007-10-23 17:40 ` Linus Torvalds
2007-10-23 18:08 ` martin f krafft
2007-10-23 18:24 ` Linus Torvalds
2007-10-23 19:17 ` martin f krafft
2007-10-23 19:38 ` Linus Torvalds
2007-10-23 19:46 ` Linus Torvalds
2007-10-31 21:16 ` Alejandro Martinez Ruiz
2007-10-31 21:27 ` martin f krafft
2007-10-31 21:34 ` Linus Torvalds
2007-10-23 19:33 ` Junio C Hamano
2007-10-23 19:49 ` Linus Torvalds
2007-10-23 20:33 ` [PATCH] revert/cherry-pick: work on merge commits as well Junio C Hamano
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=vpqejflolb5.fsf@bauges.imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=madduck@madduck.net \
/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;
as well as URLs for NNTP newsgroup(s).