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

git merge --abort deletes unstaged files

From
AHAndré Hänsel <andre@webkr.de>
Date
Sep 15, 2014, 15:43 UTC
Message-ID
<04af01cfd0fb$d077e200$7167a600$@webkr.de>

As discussed in https://groups.google.com/forum/#!topic/git-users/uR7gzLL2Ovc:

I ran git merge to merge a branch. There were some conflicted files. Although they were automatically resolved by git rerere, I still had to add them. I accidentally ran "git add ." instead of "git add -u". I noticed my mistake and ran "git merge --abort" to start over. To my dismay all my untracked files were gone.

Next: Andreas Schwab
Message 1 of 6 in “git merge --abort deletes unstaged files”
  1. André HänselSep 15, 2014
  2. Andreas SchwabSep 15, 2014
  3. Junio C HamanoSep 15, 2014
  4. Andreas SchwabSep 15, 2014
  5. Junio C HamanoSep 15, 2014
  6. Andreas SchwabSep 15, 2014

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.