From owner-freebsd-git@FreeBSD.ORG  Mon Jun  2 21:26:06 2014
Return-Path: <owner-freebsd-git@FreeBSD.ORG>
Delivered-To: freebsd-git@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 41691D81;
 Mon,  2 Jun 2014 21:26:06 +0000 (UTC)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
 by mx1.freebsd.org (Postfix) with ESMTP id 2DF1826B3;
 Mon,  2 Jun 2014 21:26:05 +0000 (UTC)
Received: from u10-2-32-011.office.norse-data.com (unknown [50.204.88.51])
 by elvis.mu.org (Postfix) with ESMTPSA id E997B1A3C4B;
 Mon,  2 Jun 2014 14:26:04 -0700 (PDT)
Message-ID: <538CEBF2.9090200@freebsd.org>
Date: Mon, 02 Jun 2014 14:26:10 -0700
From: Alfred Perlstein <alfred@freebsd.org>
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9;
 rv:24.0) Gecko/20100101 Thunderbird/24.5.0
MIME-Version: 1.0
To: Craig Rodrigues <rodrigc@FreeBSD.org>
Subject: Re: Tracking FreeBSD in a 3rd party product using git
References: <CAG=rPVcWu1yEkvB8kH0yb_mH4cekfH96S5jr6Bskssj1koTU4w@mail.gmail.com>
In-Reply-To: <CAG=rPVcWu1yEkvB8kH0yb_mH4cekfH96S5jr6Bskssj1koTU4w@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: freebsd-git@freebsd.org
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jun 2014 21:26:06 -0000


On 6/2/14, 1:28 PM, Craig Rodrigues wrote:
> Hi,
>
> In this talk:
>
> http://www.ixsystems.com/whats-new/tracking-freebsd-in-freenas-by-using-git-for-newbies/
>
> In the section "Talking about the rebase operation",
> there seems to be some text missing which illustrates that
> actual "git rebase" command used.
>
> Do you have another copy of the presentation with the full text?
>
> I think it is OK to have this on the iXsystems blog,
> but I would rather see a copy of this on wiki.freebsd.org.
>
> This document is super useful.  Recently, I rebased
> FreeNAS from FreeBSD 9 to FreeBSD 10.  It took me only a few days
> to do the rebase and resolve conflicts.  Using something like Subversion,
> it probably would have taken me weeks.
>
> My opinion is that we should really promote using git as a good, solid
> way to track FreeBSD in a third party product.
>
> --
> Craig
Thanks Craig, more information is available here:
http://splbio.wordpress.com/2012/11/24/basing-a-commercial-product-on-freebsd-using-git/

I can find some information on finding out the --onto, I really thought 
I had uploaded this somewhere, but it has disappeared.  I will check my 
laptop when I get home to find the entirety of the notes I have for this 
talk.

-Alfred