From: Nicolas Pitre Date: Fri, 12 Dec 2008 20:07:38 GMT Subject: Re: [PATCH] Simplified GIT usage guide Message-ID: In-Reply-To: <20081212182827.28408.40963.stgit@warthog.procyon.org.uk> Another obvious correction... On Fri, 12 Dec 2008, David Howells wrote: > + A commit object will typically refer to one base commit when someone has > + merely committed some changes on top of the current state, and two base > + commits when a couple of trees have been merged. If you have two bases, then only two trees were merged together. If you merged a "couple" of trees, then a "couple" of bases are registered. Nicolas