[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git pull fails with merge conflicts. How can this possibly happen?
From: |
Stephen J. Turnbull |
Subject: |
Re: git pull fails with merge conflicts. How can this possibly happen? |
Date: |
Sun, 16 Nov 2014 03:25:52 +0900 |
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.
- Re: git pull fails with merge conflicts. How can this possibly happen?, (continued)
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Engster, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Stephen J. Turnbull, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?,
Stephen J. Turnbull <=
- git apologia [was: git pull fails with merge conflicts. ...], Stephen J. Turnbull, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], Eli Zaretskii, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], Stephen J. Turnbull, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], David Kastrup, 2014/11/15
- Git's victory and an entertaining irony, Eric S. Raymond, 2014/11/15
- Git's victory and an entertaining irony, Stephen J. Turnbull, 2014/11/15
- Re: Git's victory and an entertaining irony, Eric S. Raymond, 2014/11/16
- Re: git apologia [was: git pull fails with merge conflicts. ...], Andreas Schwab, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], Eli Zaretskii, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], David Kastrup, 2014/11/15