* how to undo a merge
@ 2011-11-01 7:27 Hong-Ming Su
2011-11-01 7:56 ` Vincent van Ravesteijn
0 siblings, 1 reply; 2+ messages in thread
From: Hong-Ming Su @ 2011-11-01 7:27 UTC (permalink / raw)
To: git
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?
Thank you!
Best regards,
Hong-Ming
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: how to undo a merge
2011-11-01 7:27 how to undo a merge Hong-Ming Su
@ 2011-11-01 7:56 ` Vincent van Ravesteijn
0 siblings, 0 replies; 2+ messages in thread
From: Vincent van Ravesteijn @ 2011-11-01 7:56 UTC (permalink / raw)
To: Hong-Ming Su; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-01 7:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-01 7:27 how to undo a merge Hong-Ming Su
2011-11-01 7:56 ` Vincent van Ravesteijn
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).