emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git question


From: Eric Abrahamsen
Subject: Re: git question
Date: Wed, 27 Jun 2018 08:52:45 -0700
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)

Andreas Schwab <address@hidden> writes:

> On Jun 27 2018, Jean-Christophe Helary <address@hidden> 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 address@hidden
>
> 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..




reply via email to

[Prev in Thread] Current Thread [Next in Thread]