From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Bryan Donlan <bdonlan@gmail.com>,
John Tapsell <johnflux@gmail.com>,
Jay Soffian <jaysoffian@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Nanako Shiraishi <nanako3@lavabit.com>
Subject: Re: git merge --abort
Date: Sat, 21 Feb 2009 11:18:30 +0100 [thread overview]
Message-ID: <200902211118.32185.jnareb@gmail.com> (raw)
In-Reply-To: <7v3ae8rvvd.fsf@gitster.siamese.dyndns.org>
On Sat, 21 Feb 2009, Junio C Hamano wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
>
> > Perhaps this is the case fo "feature that waits for a user", namely
> > 'git stash --no-reset', which would save a state just in case, perhaps
> > in a separate area and not refs/stash (ORIG_STASH perhaps?).
>
> Isn't that Nana's "git stash --keep" patch posted a few weeks ago sitting
> in "pu"?
Almost exactly.
When using it as a safety measure (perhaps enabled via configuration
variable, similarly to core.safecrlf or diff.autoRefreshIndex) we would
probably want to not save it in 'refs/stash' stack, but in single-use
ORIG_STATE (similar to HEAD reflog vs. ORIG_HEAD). And of course have
"git merge --abort" (or even "git pull --abort") as a porcelain.
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2009-02-21 10:19 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
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 [this message]
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=200902211118.32185.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=bdonlan@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=johnflux@gmail.com \
--cc=nanako3@lavabit.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.