From owner-freebsd-questions@FreeBSD.ORG  Thu Feb 24 12:36:22 2011
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B80CC106566C
	for <freebsd-questions@freebsd.org>;
	Thu, 24 Feb 2011 12:36:22 +0000 (UTC)
	(envelope-from freebsd@qeng-ho.org)
Received: from fileserver.home.qeng-ho.org (blue.qeng-ho.org [217.155.128.241])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BE998FC1C
	for <freebsd-questions@freebsd.org>;
	Thu, 24 Feb 2011 12:36:21 +0000 (UTC)
Received: from fileserver.home.qeng-ho.org (localhost [127.0.0.1])
	by fileserver.home.qeng-ho.org (8.14.4/8.14.4) with ESMTP id
	p1OCaK94012000
	for <freebsd-questions@freebsd.org>; Thu, 24 Feb 2011 12:36:20 GMT
	(envelope-from freebsd@qeng-ho.org)
Message-ID: <4D6650C4.4040906@qeng-ho.org>
Date: Thu, 24 Feb 2011 12:36:20 +0000
From: Arthur Chance <freebsd@qeng-ho.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.1.16) Gecko/20101218 Thunderbird/3.0.11
MIME-Version: 1.0
To: FreeBSD-Questions <freebsd-questions@freebsd.org>
References: <4D5CCB72.20505@gmail.com>	<44ei75xyn6.fsf@be-well.ilk.org>	<4D6580EC.8090007@gmail.com>	<44mxlmtn3i.fsf@be-well.ilk.org>
	<4D65F518.9020700@infracaninophile.co.uk>
In-Reply-To: <4D65F518.9020700@infracaninophile.co.uk>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: mergemaster -U ask for a lot non-user modified files
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Feb 2011 12:36:22 -0000

On 02/24/11 06:05, Matthew Seaman wrote:
[Snip mergemaster options discussion.]
>
> Doing this certainly works for me -- frequently the only file I get
> asked about is /etc/motd

And if you don't care about updating /etc/motd (the first line is 
automagically updated every boot anyway) add

IGNORE_FILES='/etc/motd'

to /etc/mergemaster.rc