From owner-cvs-ports@FreeBSD.ORG  Sun Apr  9 00:05:22 2006
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
X-Original-To: cvs-ports@FreeBSD.org
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 32E3416A404;
	Sun,  9 Apr 2006 00:05:22 +0000 (UTC)
	(envelope-from anholt@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 63AD843D67;
	Sun,  9 Apr 2006 00:05:21 +0000 (GMT)
	(envelope-from anholt@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 k3905BTE025346;
	Sun, 9 Apr 2006 00:05:11 GMT
	(envelope-from anholt@repoman.freebsd.org)
Received: (from anholt@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3905BLL025345;
	Sun, 9 Apr 2006 00:05:11 GMT (envelope-from anholt)
Message-Id: <200604090005.k3905BLL025345@repoman.freebsd.org>
From: Eric Anholt <anholt@FreeBSD.org>
Date: Sun, 9 Apr 2006 00:05:11 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/devel/git Makefile distinfo
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Apr 2006 00:05:22 -0000

anholt      2006-04-09 00:05:11 UTC

  FreeBSD ports repository

  Modified files:
    devel/git            Makefile distinfo 
  Log:
  Update to 1.2.6, and tune the cogito CONFLICTS to .10 to .12, since .17.2 will
  live side-by-side in harmony.
  
  Revision  Changes    Path
  1.9       +2 -2      ports/devel/git/Makefile
  1.5       +3 -3      ports/devel/git/distinfo