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

Re: git merge --abort deletes unstaged files

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Sep 15, 2014, 17:16 UTC
Message-ID
<87k354x0qt.fsf@igel.home>
In-Reply-To
<04af01cfd0fb$d077e200$7167a600$@webkr.de>
André Hänsel <andre@webkr.de> writes:
> 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.
If you want them to be added automatically, set rerere.autoupdate=true.
Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Previous: André HänselNext: Junio C Hamano
Message 2 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.