From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Feb 2010 04:06:41 GMT
Subject: Re: Host refs to push are chosen (documentation error)?
Message-ID: <7vocjnuqzy.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100218021010.GA21693@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> @@ -217,10 +217,8 @@ them easily.
>  MERGE_HEAD records the commit(s) you are merging into your branch
>  when you run 'git merge'.
>  +
> -For any of the `$GIT_DIR/refs` cases above, packed refs from
> -`$GIT_DIR/packed-refs` may be substituted (e.g., a line with
> -`refs/heads/master` in the packed-refs file would have the same
> -precedence as the file `$GIT_DIR/refs/heads/master`).
> +Note that any of the `refs/*` cases above may come either from
> +the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.

This makes it much more clear.  Thanks.