From: Vincent van Ravesteijn <vfr@lyx.org>
To: Hong-Ming Su <halleyinvent@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: how to undo a merge
Date: Tue, 01 Nov 2011 08:56:00 +0100 [thread overview]
Message-ID: <4EAFA610.9080101@lyx.org> (raw)
In-Reply-To: <CANiMyiEoaxAO3XxJMWEXP-L7C_xkxU0_nyDaor+TsJr-Ch7ARw@mail.gmail.com>
Op 1-11-2011 8:27, Hong-Ming Su schreef:
> The commit graph before merging is:
> A--B<-master
> \ \
> \ \
> C--D--E--F<- dev
>
> git checkout master
> git merge dev
>
> The commit graph after merging is:
> A--B
> \ \
> \ \
> C--D--E--F<- dev<-master
>
> master fast-forward to commit F.
> I want to "undo" the merge. What shall I do?
git checkout master
git reset B
Vincent
prev parent reply other threads:[~2011-11-01 7:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-01 7:27 how to undo a merge Hong-Ming Su
2011-11-01 7:56 ` Vincent van Ravesteijn [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=4EAFA610.9080101@lyx.org \
--to=vfr@lyx.org \
--cc=git@vger.kernel.org \
--cc=halleyinvent@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.