From: Thomas Rast <trast@student•ethz.ch>
To: Jeff King <peff@peff•net>
Cc: git <git@vger•kernel.org>
Subject: Re: how to do "git merge --abort"
Date: Fri, 21 Aug 2009 17:26:19 +0200 [thread overview]
Message-ID: <200908211726.21593.trast@student.ethz.ch> (raw)
In-Reply-To: <20090821151926.GE6850@coredump.intra.peff.net>
Jeff King wrote:
> On Fri, Aug 21, 2009 at 10:51:57PM +0800, bill lam wrote:
>
> > How to abort a merge if it said there are conflicts but I do not want
> > to (or can not) resolve it for the moment. I can not find the --abort
> > option as that for git-rebase.
>
> It is spelled "git reset --merge" (though --merge was introduced in
> v1.6.1; prior to that, you had to use "git reset --hard").
Umm, no, you still have to use "git reset --hard".
"git reset --merge cmt" is a rough equivalent for
git stash
git reset --hard cmt
git stash pop
and fills the case where you merged with (unrelated) unstaged changes,
and want to discard the merge while keeping the changes.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2009-08-21 15:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-21 14:51 how to do "git merge --abort" bill lam
2009-08-21 15:19 ` Jeff King
2009-08-21 15:26 ` Thomas Rast [this message]
2009-08-21 15:37 ` Jeff King
2009-08-22 1:56 ` bill lam
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=200908211726.21593.trast@student.ethz.ch \
--to=trast@student$(echo .)ethz.ch \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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