On Wed, Feb 17, 2010 at 08:06:41PM -0800, Junio C Hamano wrote: > Jeff King <peff@xxxxxxxx> 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. Do you want a repost with the squashed text? -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html