Hello Johannes,
On 05/03/2011 01:52 AM, Johannes Brunen wrote:
>> Normally to update your local repository you'd do a 'git pull' which
>> internally does 'git fetch' (fetching changes from the remote
>> repository) and then 'git merge' (merging them into the branch you've
>> checked out locally).
>> So what you can do is to manually run 'git fetch' to only obtain the
>> changes, but not modify your local branch(es). You can then use 'gitk
>> --all' (or just 'git log origin/master') to see the remote changes.
>>
> Looks like I have to learn git...
>
>
> So let me summerize...
> git clone xxx -> create rep in empty environment
> git pull -> in git enviromnent is a like git fetch + git merge
> ...i.e. if I want be synchronized with the main repository of OpenSG 2 I
> have to do rerun git pull?
yes, you can think of it as a replacement for 'svn up'.
> Is there a command to revert to the last state of the local clone if
> something does not match my expectations (undo)?
sure, with git you always have a copy of the repo (that includes full
history), so you can go to any point in the past (without network
access). The individual commits are identified by their SHA1 hash (you
don't normally need the whole hash a unique start sequence is accepted
by all commands), which you can discover with either 'git log' or by
using e.g. gitk for more convenient browsing. Once you have the hash
just do 'git checkout <hash>' and your working copy is set to that commit.
One other thing i do whenever i make a new build for use around the
office is that i create a tag in the (local) repository so that i can
keep track of which versions we used over time. To tag the currently
checked out commit: 'git tag <name>' to tag a different commit 'git tag
<name> <hash>'
Cheers,
Carsten
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Opensg-users mailing list
Opensg-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensg-users
