Re: git question

[Jean-Christophe Helary <brandelune@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]



> On Jun 27, 2018, at 23:23, Yuri Khan <yurivkhan@gmail.com> wrote:
> 
> On Wed, Jun 27, 2018 at 9:03 PM Jean-Christophe Helary
> <brandelune@gmail.com> wrote:
> 
>> 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?
> 
> Normally you would first do a “git fetch”, then see the diff between
> current state and the remote branch, and only then decide if you want
> to merge that:

:) I trust the commiters to only commit proper code. I'm just curious about some files sometimes.
But thank you for the hint !

> $ git fetch
> $ git diff HEAD..origin/master
> $ git merge origin/master
> 
> (substitute a different remote branch name as necessary).
> 
> But if you did a blind pull already, you can look back this way:
> 
> $ git diff HEAD@{1}..

Thank you, and thank you Andreas for the same reply.

Now, if I want to only check 1 file out of the multiple files that have been commited ?


Jean-Christophe Helary
-----------------------------------------------
http://mac4translators.blogspot.com @brandelune



[-- Attachment #2: Type: text/html, Size: 3310 bytes --]