git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git merge --abort

From
Jakub Narebski <jnareb@gmail.com>
Date
Feb 21, 2009, 10:18 UTC
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:
Show 8 quoted lines
> 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
Previous: Junio C HamanoNext: John Tapsell
Message 13 of 18 in “git merge --abort”
  1. John TapsellFeb 19, 2009
  2. Junio C HamanoFeb 19, 2009
  3. John TapsellFeb 19, 2009
  4. Jay SoffianFeb 19, 2009
  5. John TapsellFeb 20, 2009
  6. Junio C HamanoFeb 20, 2009
  7. John TapsellFeb 20, 2009
  8. Junio C HamanoFeb 20, 2009
  9. John TapsellFeb 20, 2009
  10. Bryan DonlanFeb 21, 2009
  11. Jakub NarebskiFeb 21, 2009
  12. Junio C HamanoFeb 21, 2009
  13. Jakub NarebskiFeb 21, 2009
  14. John TapsellFeb 23, 2009
  15. Junio C HamanoFeb 24, 2009
  16. Jakub NarebskiFeb 24, 2009
  17. Junio C HamanoFeb 24, 2009
  18. Jakub NarebskiFeb 24, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.