From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen 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 14:26:54 +0200 Message-ID: <55251E8E.1090208@math.ntnu.no> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428496040 20871 80.91.229.3 (8 Apr 2015 12:27:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Apr 2015 12:27:20 +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:27:14 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 1Yfp4c-00039S-8L for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 14:27:14 +0200 Original-Received: from localhost ([::1]:52569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfp4b-000601-Bw for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 08:27:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfp4P-0005zu-KK for emacs-devel@gnu.org; Wed, 08 Apr 2015 08:27:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yfp4O-0006vw-Qg for emacs-devel@gnu.org; Wed, 08 Apr 2015 08:27:01 -0400 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:47165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfp4O-0006vI-K2 for emacs-devel@gnu.org; Wed, 08 Apr 2015 08:27:00 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 160B290576A; Wed, 8 Apr 2015 14:26:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:700:300:1470:3831:5564:b302:a360] (unknown [IPv6:2001:700:300:1470:3831:5564:b302:a360]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 66C0690D61D; Wed, 8 Apr 2015 14:26:55 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <86egnultem.fsf@example.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::225 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:185146 Archived-At: Sebastien Vauban wrote: > I had the impression that "git show" was an older command, now > replaceable by "git log" with some options. Is my impression right? As the two commands take many of the same options, you are probably=20 right. =E2=80=9Cgit log -1 -p=E2=80=9D looks like a good start. > 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 lates= t > commit (HEAD, as you said)? Yes. There is also =E2=80=9Cgit diff --cached=E2=80=9D (--staged is an al= ias of --cached=20 here) which shows the diff between the commit (HEAD by default) and the=20 index / staging area. (One annoying feature of git is the great variation in terminology. It=20 seems they have moved to new (and better?) terminology over time, but=20 the old terminology remains, so that you now have to learn two or three=20 synonymous terms for many concepts.) =E2=80=93 Harald