From owner-cvs-all@FreeBSD.ORG  Mon Feb 13 23:47:49 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7B1D116A420;
	Mon, 13 Feb 2006 23:47:49 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3501843D49;
	Mon, 13 Feb 2006 23:47:49 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DNln3u032255;
	Mon, 13 Feb 2006 23:47:49 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DNlmlI032254;
	Mon, 13 Feb 2006 23:47:49 GMT (envelope-from rwatson)
Message-Id: <200602132347.k1DNlmlI032254@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 13 Feb 2006 23:47:48 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Feb 2006 23:47:49 -0000

rwatson     2006-02-13 23:47:48 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:
  
    Add a -A argument to mergemaster to allow explicitly specifying an
    architecture to pass through to the underlying makefiles.  This is
    quite useful when building on an i386 box to populate an amd64 NFS
    root.
  
    Head nod:       dougb
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.32.2.2  +6 -1      src/usr.sbin/mergemaster/mergemaster.8
  1.51.8.2  +11 -7     src/usr.sbin/mergemaster/mergemaster.sh