From: Jean-Christophe Helary <brandelune@gmail.com>
To: Yuri Khan <yurivkhan@gmail.com>
Cc: Emacs developers <emacs-devel@gnu.org>
Subject: Re: git question
Date: Wed, 27 Jun 2018 23:29:53 +0900 [thread overview]
Message-ID: <25CA8208-3609-421D-867F-6F69B706B27B@gmail.com> (raw)
In-Reply-To: <CAP_d_8XOSMnXXYAv-S2gzo5km6v16pCHs=gdid-kXYhv7RgWdw@mail.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 --]
next prev parent reply other threads:[~2018-06-27 14:29 UTC|newest]
Thread overview: 20+ 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
2018-06-27 23:27 ` Jean-Christophe Helary
2018-06-27 14:23 ` Yuri Khan
2018-06-27 14:29 ` Jean-Christophe Helary [this message]
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
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=25CA8208-3609-421D-867F-6F69B706B27B@gmail.com \
--to=brandelune@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=yurivkhan@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).