From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eric Abrahamsen Newsgroups: gmane.emacs.devel Subject: Re: git question Date: Wed, 27 Jun 2018 08:52:45 -0700 Message-ID: <871scsusz6.fsf@ericabrahamsen.net> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1530114841 25865 195.159.176.226 (27 Jun 2018 15:54:01 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 27 Jun 2018 15:54:01 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 27 17:53:57 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fYClZ-0006bs-8Z for ged-emacs-devel@m.gmane.org; Wed, 27 Jun 2018 17:53:57 +0200 Original-Received: from localhost ([::1]:60152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYCng-0007FE-AN for ged-emacs-devel@m.gmane.org; Wed, 27 Jun 2018 11:56:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYCnW-0007Em-Lu for emacs-devel@gnu.org; Wed, 27 Jun 2018 11:55:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYCnS-0001b0-QE for emacs-devel@gnu.org; Wed, 27 Jun 2018 11:55:58 -0400 Original-Received: from [195.159.176.226] (port=35438 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYCnS-0001aP-IE for emacs-devel@gnu.org; Wed, 27 Jun 2018 11:55:54 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1fYClJ-0006ML-2n for emacs-devel@gnu.org; Wed, 27 Jun 2018 17:53:41 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 41 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:S7nnYYfKsm6JII+W1AUmVdRtQDA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:226787 Archived-At: Andreas Schwab writes: > On Jun 27 2018, Jean-Christophe Helary wrote: > >> Sorry for the beginner level for this question. >> >> When I do a git pull and I get, for ex: >> >> etc/NEWS | 6 ++++++ >> lisp/info.el | 4 ++-- >> lisp/server.el | 10 ++++++---- >> >> like I just had. >> >> What git command should I use to examine what are the modifications on the three above files? > > $ git diff HEAD@{1} > > shows the difference between HEAD and the previous state of HEAD. That was new to me -- thanks! Just for completeness' sake, the explicit (non-relative) way of doing this would be to look at the top of the fast-forward message and use the updated-from commit as an anchor: >From git.sv.gnu.org:/srv/git/emacs 61f73703c7..ce54573dac master -> origin/master 12c77f6918..9134c841f1 emacs-26 -> origin/emacs-26 Updating 61f73703c7..ce54573dac Fast-forward doc/emacs/files.texi | 2 +- doc/lispref/internals.texi | 3 ++- etc/NEWS | 6 ++++++ lisp/emacs-lisp/regexp-opt.el | 10 +++++----- lisp/ido.el | 15 +++++++++++---- lisp/info.el | 4 ++-- lisp/net/tramp-sh.el | 6 +++++- lisp/server.el | 10 ++++++---- lisp/textmodes/css-mode.el | 3 +++ 9 files changed, 41 insertions(+), 18 deletions(-) $ git log 61f73703c7..