Date: Sat, 6 Sep 2008 21:24:46 -0500 From: Jeffrey Goldberg <jeffrey@goldmark.org> To: freebsd-questions@freebsd.org Subject: Re: alternatives to mergemaster Message-ID: <EAC94C27-E408-4B38-9484-671B598BB034@goldmark.org> In-Reply-To: <ygf1vzx2l2g.fsf@dominion.borderworlds.dk> References: <fb6605670809061028s680b3fffk9f435f8a150eb99d@mail.gmail.com> <ygf1vzx2l2g.fsf@dominion.borderworlds.dk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sep 6, 2008, at 1:20 PM, Christian Laursen wrote: > I always run mergemaster in auto upgrade mode. From the man page: > > -U Attempt to auto upgrade files that have not been user > modi- > fied. > > This can also be achieved by putting "AUTO_UPGRADE=yes" in > /etc/mergemaster.rc. AUTO_UPGRADE isn't documented in mergemaster(8). I guess it's time for me to submit my first documentation patch (unless someone beats me to it). Cheers, -j -- Jeffrey Goldberg http://www.goldmark.org/jeff/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EAC94C27-E408-4B38-9484-671B598BB034>