From owner-freebsd-git@FreeBSD.ORG  Mon Jun  2 20:28:54 2014
Return-Path: <owner-freebsd-git@FreeBSD.ORG>
Delivered-To: freebsd-git@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE3B9717;
 Mon,  2 Jun 2014 20:28:54 +0000 (UTC)
Received: from mail-la0-x22b.google.com (mail-la0-x22b.google.com
 [IPv6:2a00:1450:4010:c03::22b])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 105DB2114;
 Mon,  2 Jun 2014 20:28:50 +0000 (UTC)
Received: by mail-la0-f43.google.com with SMTP id mc6so2888271lab.2
 for <multiple recipients>; Mon, 02 Jun 2014 13:28:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:date:message-id:subject:from:to:cc:content-type;
 bh=gDa0Khpa5JJjDVPxI/3FxBi/hWyxidSGXvNZpxXJcDI=;
 b=dTN5yl/RX8USZdnQCPDLXyy64XcbuUct96jM7WsV/h63P2PRxkswKzyagRAKLb7c1M
 yh5ZuQtOLtgM3hQkT9ZSnopTqBEV7huBHAUr1W9vbq+Tn4OARhfsmsXK5iAHfd/ZmyTO
 7rivGwpnnoYg4+OsgzKuFq18B0btt4Ig+9HN4bggW/u/HZ5WYU97ez+fArluyFiaphUa
 pIxf0o+xeT3Ev8PZnkOcwvUtpDqMNEdghNOqOTwlxqg2IvhwDIHtL0zj7Pfco/bl/YOh
 Z63gT2vEMdEH5gCLW+2tZab6tqqjXFXJzNWlXGK/jPmP+WNXK+iVPEFmhCSJYqGei3px
 EtSw==
MIME-Version: 1.0
X-Received: by 10.152.43.43 with SMTP id t11mr3470548lal.89.1401740928997;
 Mon, 02 Jun 2014 13:28:48 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.67.73 with HTTP; Mon, 2 Jun 2014 13:28:48 -0700 (PDT)
Date: Mon, 2 Jun 2014 13:28:48 -0700
X-Google-Sender-Auth: QksB3BDAGXeeP7ooKy8FP9rivo8
Message-ID: <CAG=rPVcWu1yEkvB8kH0yb_mH4cekfH96S5jr6Bskssj1koTU4w@mail.gmail.com>
Subject: Tracking FreeBSD in a 3rd party product using git
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: Alfred Perlstein <alfred@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
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 20:28:54 -0000

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