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 them to be added automatically, set rerere.autoupdate=true. > > I would have to caution against doing so without thinking, though. > In other words, it is OK if you are Andreas who knows what he is > doing, but it is not a very good advice to give to random newbies.
If you are used to doing "git add ." afterwards it can't be much worse. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
