[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git apologia [was: git pull fails with merge conflicts. ...]
From: |
Eli Zaretskii |
Subject: |
Re: git apologia [was: git pull fails with merge conflicts. ...] |
Date: |
Sat, 15 Nov 2014 20:37:20 +0200 |
> From: Andreas Schwab <address@hidden>
> Cc: "Stephen J. Turnbull" <address@hidden>, address@hidden
> Date: Sat, 15 Nov 2014 19:26:19 +0100
>
> Eli Zaretskii <address@hidden> writes:
>
> > MMDNV. But the point is that I need either forget about "git diff"
> > and switch to "git show" entirely, or use the former as replacement
> > for the "-c COMMIT" use case, and the latter for the others. IOW, one
> > more thing to re-learn, that won't serve me with any other VCS.
>
> You still need git diff for showing the changes in your work tree
> wrt. HEAD, or the index.
Right. Which is why I only use show after a commit before a push.
- Re: git pull fails with merge conflicts. How can this possibly happen?, (continued)
- 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 <=
- Re: git apologia [was: git pull fails with merge conflicts. ...], David Kastrup, 2014/11/15
- Re: git apologia, Eli Zaretskii, 2014/11/16
- Re: git apologia, Andreas Schwab, 2014/11/16
- Re: git apologia, Eli Zaretskii, 2014/11/16
- Re: git apologia, Andreas Schwab, 2014/11/16
- Re: git apologia, Eli Zaretskii, 2014/11/16
- Re: git apologia, Andreas Schwab, 2014/11/16
- Re: git apologia, Eli Zaretskii, 2014/11/16
- Re: git apologia, Teemu Likonen, 2014/11/16
- Re: git apologia, Stephen J. Turnbull, 2014/11/16