[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: |
Eli Zaretskii |
Subject: |
Re: git pull fails with merge conflicts. How can this possibly happen? |
Date: |
Sat, 15 Nov 2014 18:55:17 +0200 |
> 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.
- 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?, Yuri Khan, 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 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 <=
- 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, 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