From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Tue, 01 Nov 2011 07:56:00 GMT
Subject: Re: how to undo a merge
Message-ID: <4EAFA610.9080101@lyx.org>
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