emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-messag


From: Eli Zaretskii
Subject: Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message,
Date: Wed, 08 Apr 2015 15:38:51 +0300

> From: Sebastien Vauban <address@hidden>
> Date: Wed, 08 Apr 2015 14:02:41 +0200
> 
> Eli Zaretskii wrote:
> > That's because "git show" expects a range of commits to show, and the
> > two dots are part of specifying a range.  The full spec of what you
> > want is "origin/master..HEAD", where HEAD stands for the last commit
> > in your local branch, but HEAD can be omitted for shorthand purposes.
> 
> I had the impression that "git show" was an older command, now
> replaceable by "git log" with some options.  Is my impression right?

Maybe, I don't know.  Does it matter, in the context of those
instructions?

> > By contrast, "git diff" takes a single commit argument, and displays
> > the diffs between the working tree and that commit.
> 
> Isn't there a difference between "git diff" and "git diff HEAD" where
> the first would show the changes between the working tree and the index,
> while the latter would show them between the working tree and the latest
> commit (HEAD, as you said)?

Yes, and that somewhat confusing aspect is why the reference to "git
diff" was deleted from the instructions in that section.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]