From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Hansen Subject: [PATCH v2 7/7] glossary: fix and clarify the definition of 'ref' Date: Mon, 2 Sep 2013 01:34:26 -0400 Message-ID: <1378100066-31889-8-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 07:47:27 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 1VGMz0-00069i-Ma for gcvg-git-2@plane.gmane.org; Mon, 02 Sep 2013 07:47:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754388Ab3IBFrR (ORCPT ); Mon, 2 Sep 2013 01:47:17 -0400 Received: from smtp.bbn.com ([128.33.1.81]:47877 "EHLO smtp.bbn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753001Ab3IBFrR (ORCPT ); Mon, 2 Sep 2013 01:47:17 -0400 Received: from socket.bbn.com ([192.1.120.102]:59480) by smtp.bbn.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1VGMml-0009X6-5G; Mon, 02 Sep 2013 01:34:47 -0400 X-Submitted: to socket.bbn.com (Postfix) with ESMTPSA id 8A0694015A 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: Signed-off-by: Richard Hansen --- Documentation/glossary-content.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index a2edcc3..44d524b 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -395,10 +395,20 @@ should not be combined with other pathspec. to the result. [[def_ref]]ref:: - A 40-byte hex representation of a <> or a name that - denotes a particular <>. They may be stored in - a file under `$GIT_DIR/refs/` directory, or - in the `$GIT_DIR/packed-refs` file. + A name that begins with `refs/` (e.g. `refs/heads/master`) + that points to an <> or another + ref (the latter is called a <>). + For convenience, a ref can sometimes be abbreviated when used + as an argument to a Git command; see linkgit:gitrevisions[7] + for details. + Refs are stored in the <>. ++ +The ref namespace is hierarchical. +Different subhierarchies are used for different purposes (e.g. the +`refs/heads/` hierarchy is used to represent local branches). ++ +There are a few special-purpose refs that do not begin with `refs/`. +The most notable example is `HEAD`. [[def_reflog]]reflog:: A reflog shows the local "history" of a ref. In other words, -- 1.8.4