From: C. Scott Ananian Date: Fri, 19 Dec 2008 00:47:12 GMT Subject: Re: [PATCH] Simplified GIT usage guide Message-ID: In-Reply-To: <20081212182827.28408.40963.stgit@warthog.procyon.org.uk> On Fri, Dec 12, 2008 at 1:28 PM, David Howells 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/ )