From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Hansen Subject: [PATCH v2 5/7] glossary: more precise definition of treeish (a.k.a. tree-ish) Date: Mon, 2 Sep 2013 01:34:24 -0400 Message-ID: <1378100066-31889-6-git-send-email-rhansen@bbn.com> References: <1378100066-31889-1-git-send-email-rhansen@bbn.com> Cc: Richard Hansen To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Mon Sep 02 08:20:59 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VGNVS-0007kT-Op for gcvg-git-2@plane.gmane.org; Mon, 02 Sep 2013 08:20:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757262Ab3IBGUu (ORCPT ); Mon, 2 Sep 2013 02:20:50 -0400 Received: from smtp.bbn.com ([128.33.0.80]:48513 "EHLO smtp.bbn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756978Ab3IBGUr (ORCPT ); Mon, 2 Sep 2013 02:20:47 -0400 Received: from socket.bbn.com ([192.1.120.102]:55320) by smtp.bbn.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1VGMmj-000NLg-Op; Mon, 02 Sep 2013 01:34:45 -0400 X-Submitted: to socket.bbn.com (Postfix) with ESMTPSA id 14E5A4015A X-Mailer: git-send-email 1.8.4 In-Reply-To: <1378100066-31889-1-git-send-email-rhansen@bbn.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: A treeish isn't a ref. Also, mention dereferencing, and that a commit dereferences to a tree, to support gitrevisions(7) and rev-parse's error messages. Signed-off-by: Richard Hansen --- Documentation/glossary-content.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 257a7fe..a2edcc3 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -499,9 +499,18 @@ should not be combined with other pathspec. <> is equivalent to a <>. [[def_treeish]]treeish (also tree-ish):: - A <> pointing to either a <>, a <>, or a <> pointing to a tag or commit or tree object. + A <> or an <> + that can be recursively dereferenced to a tree object. + Dereferencing a <> yields the + tree object corresponding to the <>'s + top <>. + The following are all treeishes: + a <>, + a tree object, + a <> that points to a tree object, + a tag object that points to a tag object that points to a tree + object, + etc. [[def_unmerged_index]]unmerged index:: An <> which contains unmerged -- 1.8.4