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

Re: git merge --abort

From
John Tapsell <johnflux@gmail.com>
Date
Feb 20, 2009, 04:47 UTC
Message-ID
<43d8ce650902192047g383a5cc1re6697e8009ad72fc@mail.gmail.com>
In-Reply-To
<76718490902191226k7b87f478p9a79b9b2372b464d@mail.gmail.com>
2009/2/19 Jay Soffian <jaysoffian@gmail.com>:
Show 5 quoted lines
> 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.
Could a stash be done automatically by the merge command, for just a case?
John
Previous: Jay SoffianNext: Junio C Hamano
Message 5 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.