[Vm-dev] git and branch JMM/SleepTime
Tobias Pape
Das.Linux at gmx.de
Wed Mar 22 21:34:40 UTC 2017
> On 22.03.2017, at 22:33, Eliot Miranda <eliot.miranda at gmail.com> wrote:
>
> Hi Stefan,
>
> On Wed, Mar 22, 2017 at 2:10 PM, Stefan Marr <smalltalk at stefan-marr.de> wrote:
>
> Hi Eliot:
>
>> On 22 Mar 2017, at 21:47, Eliot Miranda <eliot.miranda at gmail.com> wrote:
>>
>> I don't understand how to see a branch's changes.
>>
>> I updated a clone of opensmalltalk-vm and switched to John's JMM/SleepTime branch:
>>
>> McStalker.oscogvm.clean$ git pull -a
>> Already up-to-date.
>> McStalker.oscogvm.clean$ git checkout -b JMM/SleepTime
>
> This looks wrong.
> That’s just creating a fresh branch, no?
>
> You’ll probably need some variant of: git checkout -b JMM/SleepTime origin/JMM/SleepTime
>
> `git log` should then also be a better way to check whether you’re on the branch you expect.
>
> So now I'm in this state:
>
> McStalker.oscogvm.clean$ git status
> On branch Cog
> Your branch is up-to-date with 'origin/Cog'.
> nothing to commit, working tree clean
>
> What do I type to get to John's changes?
git diff JMM/SleepTime
?
>
>
> Best regards
> Stefan
>
>
> --
> Stefan Marr
> Johannes Kepler Universität Linz
> http://stefan-marr.de/research/
>
>
>
>
>
>
> --
> _,,,^..^,,,_
> best, Eliot
More information about the Vm-dev
mailing list