From: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon, 15 Sep 2014 17:16:42 GMT
Subject: Re: git merge --abort deletes unstaged files
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."