On Jan 30, 2015, at 3:56 AM, Alan W. Irwin wrote:
> git log --name-status
Nice! I didn't know about --name-status. I've always used --stat. Same idea,
slightly different output.
Dave
--
Dive into the World of Para
Hi, Arjen,
On Jan 30, 2015, at 1:15 AM, Arjen Markus wrote:
> the thing that has frustrated me using git is the fact that unlike subversion
> and most other revision control systems I have used, things are arranged in
> small steps.
This is a difference, to be sure, but I have grown to appreci
Hi, Alan,
On Jan 30, 2015, at 2:43 AM, Alan W. Irwin wrote:
> So instead of either set of commands above you should be following the
> detailed recipe which is
>
> git checkout master
> git fetch
> git merge --ff-only origin/master
FWIW, the pull command also accepts --ff-only. I have setup a
Hi Alan,
Another one for the receipe :).
Thanks,
Arjen
> -Original Message-
> From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca]
> Sent: Friday, January 30, 2015 12:56 PM
> To: Arjen Markus
> Cc: Phil Rosenberg; PLplot development list
> Subject: RE: git blog
>
> On 2015
On 2015-01-30 10:51- Arjen Markus wrote:
> 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?
git log --name-status
Alan
__
Hi Alan,
There is one thing that I am wondering about:
> -Original Message-
> From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca]
>
> 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
Hi Arjen:
I am changing the subject line for obvious reasons
On 2015-01-30 09:40- Arjen Markus wrote:
> [ A]t this stage I want to stick to the receipe :)
Exactly. And this is a perfect example why the detailed recipe is the
thing to follow.
If you decided to use
git checkout mas
Hi Phil,
Possibly, but at this stage I want to stick to the receipe :). I am beginning
to understand what the steps are doing and I have no problem following the
receipe as long as I understand what to expect – less chance of me getting
frustrated about it.
Regards,
Arjen
From: Phil Rosen
Glad it worked :)
I never used svn much so haven't much to compare. But in that case I think git
pull does both those jobs in one command. Perhaps there are other similar
compound commands that will speed things up for you
-Original Message-
From: "Arjen Markus"
Sent: 30/01/2015 09
Hi Phil,
Well, that was easy enough – the thing that has frustrated me using git is the
fact that unlike subversion and most other revision control systems I have
used, things are arranged in small steps. For instance: “git fetch” only
fetches the changes into the local repository, it does no
Hi Phil,
No problem – I was hoping for such a solution, as it seems less error-prone.
Thanks,
Arjen
From: Phil Rosenberg [mailto:p.d.rosenb...@gmail.com]
Sent: Friday, January 30, 2015 9:58 AM
To: Arjen Markus; Alan W. Irwin
Cc: PLplot development list
Subject: RE: [Plplot-devel] Probl
If you google git changing a remote's url, you should find the git
documentation that should help and save you making a new clone. Sorry I can't
paste a link as I'm sending this from my phone
-Original Message-
From: "Arjen Markus"
Sent: 30/01/2015 08:39
To: "Alan W. Irwin" ; "Phil R
Hi Alan, Phil,
Right, that must be it. I was wondering why I was not asked for my password :(.
Well, I will have to do the cloning process again then.
Thanks,
Arjen
> -Original Message-
> From: Alan W. Irwin [mailto:ir...@beluga.phys.uvic.ca]
> Sent: Thursday, January 29, 2015
13 matches
Mail list logo
