Re: [Plplot-devel] git blog

[Arjen M. <Arj...@de...>]

Hi Alan,



There is one thing that I am wondering about:


> -----Original Message-----
> From: Alan W. Irwin [mailto:ir...@be...]
>
> But that last command is potentially dangerous and could lead to a merge commit (if
> the local master has been updated in any way since the last time you pushed from
> local master to the combination of origin/master + repository).  Which is why
> README.developers say to never use "git pull", and whenever you use git merge
> always use the --ff-only option.
>
The receipe also says that you can use the log subcommand to inspect the changes. But when I do that, I get to see the log messages for the various commits, but not the files that were changed. How do I do that?

Regards,

Arjen



DISCLAIMER: This message is intended exclusively for the addressee(s) and may contain confidential and privileged information. If you are not the intended recipient please notify the sender immediately and destroy this message. Unauthorized use, disclosure or copying of this message is strictly prohibited. The foundation 'Stichting Deltares', which has its seat at Delft, The Netherlands, Commercial Registration Number 41146461, is not liable in any way whatsoever for consequences and/or damages resulting from the improper, incomplete and untimely dispatch, receipt and/or content of this e-mail.