all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eric Abrahamsen <eric@ericabrahamsen.net>
To: emacs-devel@gnu.org
Subject: Re: git question
Date: Wed, 27 Jun 2018 08:52:45 -0700	[thread overview]
Message-ID: <871scsusz6.fsf@ericabrahamsen.net> (raw)
In-Reply-To: mvmefgs2txk.fsf@suse.de

Andreas Schwab <schwab@suse.de> writes:

> On Jun 27 2018, Jean-Christophe Helary <brandelune@gmail.com> 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..




  parent reply	other threads:[~2018-06-27 15:52 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-27 13:54 git question Jean-Christophe Helary
2018-06-27 14:12 ` Van L
2018-06-27 14:20   ` Jean-Christophe Helary
2018-06-28 11:17     ` Lele Gaifax
2018-06-28 12:34       ` Jean-Christophe Helary
2018-06-27 14:19 ` Andreas Schwab
2018-06-27 15:02   ` Jean-Christophe Helary
2018-06-27 15:05     ` Andreas Schwab
2018-06-27 15:10       ` Jean-Christophe Helary
2018-06-27 15:52   ` Eric Abrahamsen [this message]
2018-06-27 23:27     ` Jean-Christophe Helary
2018-06-27 14:23 ` Yuri Khan
2018-06-27 14:29   ` Jean-Christophe Helary
2018-06-27 14:43     ` Andreas Schwab
2018-06-27 14:55       ` Jean-Christophe Helary
2018-06-27 14:49     ` Yuri Khan
2018-06-27 14:56       ` Jean-Christophe Helary
2018-06-27 15:02       ` Andreas Schwab
2018-06-27 15:35         ` Yuri Khan
2018-06-27 15:25       ` Eli Zaretskii
  -- strict thread matches above, loose matches on Subject: below --
2017-07-06  7:36 Rasmus
2017-07-06 11:58 ` Kaushal Modi
2017-07-06 13:24 ` Kyle Meyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=871scsusz6.fsf@ericabrahamsen.net \
    --to=eric@ericabrahamsen.net \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.