From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel 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 Message-ID: <83bniyhk10.fsf@gnu.org> References: <20150405124321.362.95112@vcs.savannah.gnu.org> <552130FE.1010101@yandex.ru> <83mw2mn2no.fsf@gnu.org> <5521359D.2000509@yandex.ru> <83384emoyw.fsf@gnu.org> <83egnxln0y.fsf@gnu.org> <86egnultem.fsf@example.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428496746 32524 80.91.229.3 (8 Apr 2015 12:39:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Apr 2015 12:39:06 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sebastien Vauban Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 08 14:38:53 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YfpFq-00084I-Ro for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 14:38:50 +0200 Original-Received: from localhost ([::1]:52602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfpFq-0001QS-8q for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 08:38:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfpFm-0001QC-OV for emacs-devel@gnu.org; Wed, 08 Apr 2015 08:38:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfpFi-00028L-Im for emacs-devel@gnu.org; Wed, 08 Apr 2015 08:38:46 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:53062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfpFi-00028H-AB for emacs-devel@gnu.org; Wed, 08 Apr 2015 08:38:42 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NMH00500N2WR200@mtaout26.012.net.il> for emacs-devel@gnu.org; Wed, 08 Apr 2015 15:39:57 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMH00K0RN6LOL90@mtaout26.012.net.il>; Wed, 08 Apr 2015 15:39:57 +0300 (IDT) In-reply-to: <86egnultem.fsf@example.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185147 Archived-At: > From: Sebastien Vauban > 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.