From: Jay Soffian <jaysoffian@gmail.com>
To: John Tapsell <johnflux@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: git merge --abort
Date: Thu, 19 Feb 2009 15:26:48 -0500 [thread overview]
Message-ID: <76718490902191226k7b87f478p9a79b9b2372b464d@mail.gmail.com> (raw)
In-Reply-To: <43d8ce650902190534j49e24f86k9b716190ae3d134b@mail.gmail.com>
On Thu, Feb 19, 2009 at 8:34 AM, John Tapsell <johnflux@gmail.com> wrote:
> There's no reliable way of getting back to the state before the merge?
Sure there is. Commit or stash before you merge, so that your index
and working copy are clean.
j.
next prev parent reply other threads:[~2009-02-19 20:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-19 10:05 git merge --abort John Tapsell
2009-02-19 10:58 ` Junio C Hamano
2009-02-19 13:34 ` John Tapsell
2009-02-19 20:26 ` Jay Soffian [this message]
2009-02-20 4:47 ` John Tapsell
2009-02-20 5:24 ` Junio C Hamano
2009-02-20 8:13 ` John Tapsell
2009-02-20 8:33 ` Junio C Hamano
2009-02-20 8:42 ` John Tapsell
2009-02-21 7:28 ` Bryan Donlan
2009-02-21 8:34 ` Jakub Narebski
2009-02-21 9:18 ` Junio C Hamano
2009-02-21 10:18 ` Jakub Narebski
2009-02-23 12:41 ` John Tapsell
2009-02-24 1:36 ` Junio C Hamano
2009-02-24 1:53 ` Jakub Narebski
2009-02-24 2:01 ` Junio C Hamano
2009-02-24 9:51 ` 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=76718490902191226k7b87f478p9a79b9b2372b464d@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johnflux@gmail.com \
/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).