Re: git pull fails with merge conflicts. How can this possibly happen?

[Stephen J. Turnbull]

David Kastrup writes:

 > Not if you changed branches recently.  @{1} refers to the reflog of the
 > current branch, address@hidden or @@{1} are the reflog of the whole
 > repository, including all branch switches.

Ah, I see, now.  For this purpose the content of HEAD is (usually)
another ref, and the reflog for HEAD is different from the reflog for
the ref it contains.  (I wouldn't call that the "reflog of the whole
repository", though.)  I still don't have a problem with @ = HEAD in
contexts where a ref is expected.  It's not uncommon for X to mean
something different from XX, so it's OK that @{1} != @@{1} for me.