Re: git apologia [was: git pull fails with merge conflicts. ...]

[Eli Zaretskii]

> 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.