git merge --abort deletes unstaged files

2014-09-15 Thread André Hänsel
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

Re: git merge --abort deletes unstaged files

2014-09-15 Thread Andreas Schwab
André Hänsel an...@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,

Re: git merge --abort deletes unstaged files

2014-09-15 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: André Hänsel an...@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

Re: git merge --abort deletes unstaged files

2014-09-15 Thread Andreas Schwab
Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: André Hänsel an...@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

Re: git merge --abort deletes unstaged files

2014-09-15 Thread Junio C Hamano
On Mon, Sep 15, 2014 at 2:54 PM, Andreas Schwab sch...@linux-m68k.org wrote: Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: André Hänsel an...@webkr.de writes: I ran git merge to merge a branch. There were some conflicted files. Although they were

Re: git merge --abort deletes unstaged files

2014-09-15 Thread Andreas Schwab
Junio C Hamano gits...@pobox.com writes: On Mon, Sep 15, 2014 at 2:54 PM, Andreas Schwab sch...@linux-m68k.org wrote: Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: André Hänsel an...@webkr.de writes: I ran git merge to merge a branch. There were