[Vm-dev] git and branch JMM/SleepTime

Stefan Marr smalltalk at stefan-marr.de
Wed Mar 22 21:58:59 UTC 2017

Hi Eliot:

> On 22 Mar 2017, at 22:36, Eliot Miranda <eliot.miranda at gmail.com> wrote:
> What do I type to see John's changes materialised in the relevant files in my repository?  I don’t want to copy/paste his changes :-/

~/tmp/opensmalltalk-vm$ git fetch
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (6/6), done.
From https://github.com/OpenSmalltalk/opensmalltalk-vm
   ce673d0a6..b076561ab  Cog        -> origin/Cog

~/tmp/opensmalltalk-vm$ git checkout -b JMM/SleepTime origin/JMM/SleepTime
Checking out files: 100% (57/57), done.
Branch JMM/SleepTime set up to track remote branch JMM/SleepTime from origin.
Switched to a new branch 'JMM/SleepTime'

~/tmp/opensmalltalk-vm$ git --no-pager log -n2
commit f829fb66db403a05fe0360b17a81ea5095504fbd
Author: johnmci <johnmci at smalltalkconsulting.com>
Date:   Tue Mar 21 17:13:50 2017 -0700

    Add logic to test the ability to get the sleep/wake time notifications so we can adjust idle time for the VM

commit 54bab0a7a2901d70719715625150a95ef2ab7784
Author: Eliot Miranda <eliot.miranda at gmail.com>
Date:   Tue Mar 21 08:44:09 2017 -0700

    Linux (& unix/Mac OS X):
    Fix the build of the XDisplayControlPlugin on linuxes where .so is not appended
    to shared objects.
    Fix the language in sqUnixHeartbeat.c and add more information.  Make the code
    exclusive to linux, and use exeName instead of a hardwired name.

Personally, I use Git Tower, or Git Kraken. I prefer to see stuff, without having to explicitly invoke commands.

Best regards

Stefan Marr
Johannes Kepler Universität Linz

More information about the Vm-dev mailing list