[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:05:35 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
>> From: "Stephen J. Turnbull" <address@hidden>
>> Date: Sun, 16 Nov 2014 01:31:23 +0900
>> Cc: address@hidden
>>
>> 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.
>
> That's my conclusion as well, but you won't find that in the docs.
> The description of @{n} explicitly mentions "reflog", but the
> description of address@hidden only hints on that.
address@hidden:/usr/local/tmp/lilypond$ git checkout issue216
Previous HEAD position was 2a67ab2... Doc: Document unit of \abs-fontsize
Switched to branch 'issue216'
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
address@hidden:/usr/local/tmp/lilypond$ git reflog -1 @{4}
fatal: Log for 'issue216' only has 4 entries.
address@hidden:/usr/local/tmp/lilypond$ git reflog -1 @@{4}
2a67ab2 address@hidden: checkout: moving from
2a67ab2aee4e826c1998684249ecd2e862e4804c
--
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?, 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 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 <=
- 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, 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