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

[Andreas Schwab]

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.  git show is about showing the contents of an
object, be it a commit or a tree or a blob.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."