DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version
         :content-type:content-transfer-encoding:content-disposition
         :references:x-google-sender-auth;
        b=ueYJgsiTVP2zWtmkp6G8ohY1AeiGnBjrbvEIa86RNyWymqfdFeoSRZRaobDG+Op1Ga
         S2TFCxVydukoJ8Iur3StdY2ZB1BgVR2mGNgPtN9yfExrc1MkzgEJpvfWcQJtVl974aZG
         dHTc8k064/sZ4DQraVQYara3X+wv+7a3NpsYE=
Message-ID: <c6d9bea0812181647n55fbb6b9w333702fc80127198@mail.gmail.com>
Date: Thu, 18 Dec 2008 19:47:12 -0500
From: "C. Scott Ananian" <cscott@laptop.org>
To: "David Howells" <dhowells@redhat.com>
Subject: Re: [PATCH] Simplified GIT usage guide
Cc: git@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20081212182827.28408.40963.stgit@warthog.procyon.org.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <20081212182827.28408.40963.stgit@warthog.procyon.org.uk>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 854
Lines: 18

On Fri, Dec 12, 2008 at 1:28 PM, David Howells <dhowells@redhat.com> wrote:
> Add a guide to using GIT's simpler features.
> diff --git a/Documentation/git-haters-guide.txt b/Documentation/git-haters-guide.txt
> +In the above example, I've assumed that you've got your own tree with the head
> +at commit C3, and that you've got a branch that you want to merge, which has
> +its head at commit B3.  After merging them, you'd end up with a directed,
> +cyclic tree:

That should be, "acyclic".  There are no cycles, because the graph is directed.
  --scott

-- 
                         ( http://cscott.net/ )
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/