[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: |
David Kastrup |
Subject: |
Re: git pull fails with merge conflicts. How can this possibly happen? |
Date: |
Sat, 15 Nov 2014 18:03:56 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
"Stephen J. Turnbull" <address@hidden> writes:
> David Kastrup writes:
>
> > Which seems like a really stupid idea since it means that address@hidden
> > is different from @{1} but is the same as @@{1}.
>
> No, they all mean the same thing AFAICT.
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.
> The first and third are obviously the same. The second is defined as
> meaning <current>@{1}, but I believe that <current> is implemented by
> dereffing HEAD.
Nope.
> I'm not sure what happens if HEAD is detached, but that will happen
> regardless of which notation you use.
@{1} will then revert to the global reflog and then all three are
indeed equal. But not with a branch checked out.
--
David Kastrup
- 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?, 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 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 <=
- Re: git pull fails with merge conflicts. How can this possibly happen?, Stephen J. Turnbull, 2014/11/15
- 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