From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 21 Feb 2009 10:18:30 GMT
Subject: Re: git merge --abort
Message-ID: <200902211118.32185.jnareb@gmail.com>
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