Re: git merge --abort deletes unstaged files

André Hänsel [off-list ref] 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."