From owner-cvs-src@FreeBSD.ORG  Sat Feb  4 18:24:06 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D6F3716A420;
	Sat,  4 Feb 2006 18:24:06 +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 9C0F043D45;
	Sat,  4 Feb 2006 18:24:06 +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 k14IO6g1037971;
	Sat, 4 Feb 2006 18:24:06 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14IO6in037970;
	Sat, 4 Feb 2006 18:24:06 GMT (envelope-from rwatson)
Message-Id: <200602041824.k14IO6in037970@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 4 Feb 2006 18:24:06 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2006 18:24:07 -0000

rwatson     2006-02-04 18:24:06 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  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
  MFC after:      1 week
  
  Revision  Changes    Path
  1.34      +6 -1      src/usr.sbin/mergemaster/mergemaster.8
  1.53      +11 -7     src/usr.sbin/mergemaster/mergemaster.sh