From: Miklos Vajna <vmiklos@frugalware.org>
To: ff <ff@member.org>
Cc: git@vger.kernel.org
Subject: Re: how to undo a git merge?
Date: Fri, 11 Jul 2008 20:53:32 +0200 [thread overview]
Message-ID: <20080711185332.GJ10347@genesis.frugalware.org> (raw)
In-Reply-To: <fa7d16350807111146m18b0ca9q6902c2167bfd3512@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 619 bytes --]
On Fri, Jul 11, 2008 at 02:46:15PM -0400, ff <ff@member.org> wrote:
> ooops... yes... I'm scared of the reply-all button. :)
Also please don't top-post, thanks. ;-)
> In your example, how and why you can determine that the number 1
> represents the "foo" branch? Would "-m 2" represent the master branch?
> In your example is there any other choice for the "-m" number to use?
If the merge has two parents, then the first one is the actual branch
and the second is the 'other' branch.
So if 'master' is checked out, you did a 'git merge foo', and you want
to do a revert, '1' stands for 'master' and '2' for 'foo'.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-11 18:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-11 16:16 how to undo a git merge? ff
2008-07-11 16:19 ` Miklos Vajna
[not found] ` <fa7d16350807111107o40c5cbb5xc06c3c56b16b7499@mail.gmail.com>
2008-07-11 18:14 ` Miklos Vajna
2008-07-11 18:46 ` ff
2008-07-11 18:53 ` Miklos Vajna [this message]
2008-07-11 18:55 ` Sverre Rabbelier
2008-07-11 17:13 ` Jakub Narebski
[not found] ` <fa7d16350807111108y3a8a7c3di19598a56dbbcdc15@mail.gmail.com>
2008-07-11 18:36 ` Jakub Narebski
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=20080711185332.GJ10347@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=ff@member.org \
--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;
as well as URLs for NNTP newsgroup(s).