From: Andreas Schwab <schwab@linux-m68k.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: "Stephen J. Turnbull" <stephen@xemacs.org>, emacs-devel@gnu.org
Subject: Re: git apologia [was: git pull fails with merge conflicts. ...]
Date: Sat, 15 Nov 2014 19:26:19 +0100 [thread overview]
Message-ID: <877fywb9ro.fsf@igel.home> (raw)
In-Reply-To: <834mu0flug.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 18:51:51 +0200")
Eli Zaretskii <eliz@gnu.org> 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, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2014-11-15 18:26 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-14 18:37 git pull fails with merge conflicts. How can this possibly happen? Alan Mackenzie
2014-11-14 19:01 ` David Caldwell
2014-11-14 21:54 ` Alan Mackenzie
2014-11-15 5:41 ` Yuri Khan
2014-11-15 8:14 ` Eli Zaretskii
2014-11-15 9:20 ` Stephen J. Turnbull
2014-11-15 10:54 ` Eli Zaretskii
2014-11-15 11:15 ` David Engster
2014-11-15 11:19 ` David Kastrup
2014-11-15 11:30 ` Eli Zaretskii
2014-11-15 14:38 ` David Kastrup
2014-11-15 16:21 ` Eli Zaretskii
2014-11-15 16:31 ` Stephen J. Turnbull
2014-11-15 16:55 ` Eli Zaretskii
2014-11-15 17:05 ` David Kastrup
2014-11-15 17:03 ` David Kastrup
2014-11-15 18:25 ` Stephen J. Turnbull
2014-11-15 16:25 ` git apologia [was: git pull fails with merge conflicts. ...] Stephen J. Turnbull
2014-11-15 16:51 ` Eli Zaretskii
2014-11-15 18:16 ` Stephen J. Turnbull
2014-11-15 18:41 ` David Kastrup
2014-11-15 19:13 ` Git's victory and an entertaining irony Eric S. Raymond
2014-11-16 0:04 ` Stephen J. Turnbull
2014-11-16 6:00 ` Eric S. Raymond
2014-11-15 18:26 ` Andreas Schwab [this message]
2014-11-15 18:37 ` git apologia [was: git pull fails with merge conflicts. ...] Eli Zaretskii
2014-11-15 18:47 ` David Kastrup
2014-11-16 16:06 ` git apologia Eli Zaretskii
2014-11-16 16:36 ` Andreas Schwab
2014-11-16 18:04 ` Eli Zaretskii
2014-11-16 18:20 ` Andreas Schwab
2014-11-16 18:38 ` Eli Zaretskii
2014-11-16 18:50 ` Andreas Schwab
2014-11-16 18:58 ` Eli Zaretskii
2014-11-16 18:55 ` Teemu Likonen
2014-11-17 0:14 ` Stephen J. Turnbull
2014-11-17 16:41 ` Eli Zaretskii
2014-11-17 16:50 ` Andreas Schwab
2014-11-17 17:47 ` Eli Zaretskii
2014-11-17 16:57 ` David Kastrup
2014-11-17 18:55 ` Achim Gratz
2014-11-18 1:16 ` Yuri Khan
2014-11-18 8:58 ` Thien-Thi Nguyen
2014-11-18 13:53 ` John Yates
2014-11-18 19:45 ` Thien-Thi Nguyen
2014-11-18 9:39 ` Andreas Schwab
2014-11-18 16:42 ` Barry Warsaw
2014-11-17 12:38 ` git pull fails with merge conflicts. How can this possibly happen? Sergey Organov
2014-11-17 16:05 ` Eli Zaretskii
2014-11-17 16:54 ` David Kastrup
2014-11-17 21:09 ` Sergey Organov
2014-11-18 3:29 ` Glenn Morris
2014-11-18 22:57 ` Alan Mackenzie
2014-11-15 10:56 ` David Kastrup
2014-11-15 13:43 ` Stephen J. Turnbull
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877fywb9ro.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=stephen@xemacs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).