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: Mon, 06 Apr 2015 10:43:41 +0300 Message-ID: <83egnxln0y.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428306247 29994 80.91.229.3 (6 Apr 2015 07:44:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 07:44:07 +0000 (UTC) Cc: emacs-devel@gnu.org, dgutov@yandex.ru To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 09:44:00 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 1Yf1hP-0000gI-Oh for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 09:43:59 +0200 Original-Received: from localhost ([::1]:39035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf1hP-0008Sm-6q for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 03:43:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf1h9-0008Sh-1Z for emacs-devel@gnu.org; Mon, 06 Apr 2015 03:43:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf1h5-0000P6-0B for emacs-devel@gnu.org; Mon, 06 Apr 2015 03:43:42 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:44097) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf1h4-0000On-Or; Mon, 06 Apr 2015 03:43:38 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NMD00G00JS2MM00@a-mtaout20.012.net.il>; Mon, 06 Apr 2015 10:43:37 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMD00GDXK4OKW40@a-mtaout20.012.net.il>; Mon, 06 Apr 2015 10:43:37 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:185009 Archived-At: > Date: Mon, 06 Apr 2015 01:50:25 -0400 > From: Richard Stallman > CC: dgutov@yandex.ru, emacs-devel@gnu.org > > > It is a good idea to examine what you are about to push, before > > actually doing so, because fixing mistakes before pushing is much > > easier (see the next section). To do that, use the command "git diff > > origin/master". If you want to show your unpushed commits with their > > commit log messages, use "git show origin/master.." instead. > > It is not clear to me how these two differ. Does "git show origin/master.." > output everything that "git diff origin/master" outputs, plus log messages? Yes, that's the only real difference between them, when you have no uncommitted changes. (When you do have uncommitted changes, "git diff" will include them, while "git show" will not.) > What are the two periods for? 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. By contrast, "git diff" takes a single commit argument, and displays the diffs between the working tree and that commit. Do you think it would be best to keep only "git show" there and delete the reference to "git diff"?