From: bill lam <cbill.lam@gmail•com>
To: git <git@vger•kernel.org>
Subject: how to do "git merge --abort"
Date: Fri, 21 Aug 2009 22:51:57 +0800 [thread overview]
Message-ID: <20090821145157.GA6471@debian.b2j> (raw)
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.
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
next reply other threads:[~2009-08-21 14:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-21 14:51 bill lam [this message]
2009-08-21 15:19 ` how to do "git merge --abort" Jeff King
2009-08-21 15:26 ` Thomas Rast
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=20090821145157.GA6471@debian.b2j \
--to=cbill.lam@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/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