[cctbxbb] Git status update

markus.gerstel at diamond.ac.uk markus.gerstel at diamond.ac.uk
Wed Aug 17 07:17:59 PDT 2016


Hello everyone,

since I have received no complaints and heard nothing to the contrary, so I thought I would let you know on the current state of the git migration:


Until *Thursday, 1 September 2016*, 07:59 BST/08:59 CEST/11:59 pm PDT

Cctbx development happens on Sourceforge. Note that cctbx development is "frozen" in preparation for the phenix release.

If you are actively developing cctbx you should *now* sign up for a GitHub account. If you are not among the 27 people that have already joined the cctbx project at https://github.com/cctbx then please send me a mail with your github account name so I can invite you.

In preparation for the move to github you should also install git on your machines.

Set up your local installation of git on each machine you are using by running
> git config --global pull.rebase true
> git config --global user.name "John Doe"
> git config --global user.email "your_email at example.com"
Use an email address you have set up in your GitHub account at https://github.com/settings/emails. 
Note that this address will be forever publically readable! If you do not want your mail address to be public, you need to verify any (private) mail address with GitHub and then check the /Keep my email address private/ box at the link above.
You can then use the dummy address <yourgithubname>@users.noreply.github.com instead.

Other useful settings may be
> git config --global alias.up "pull --rebase"
To enable a *git up* command working much like svn up does.
> git config --global alias.unstage "reset HEAD"
*git unstage* to easily undo *git add*/*git rm*.
> git config --global alias.mkremotebranch "push origin -u"
*git mkremotebranch* will copy your current local branch to GitHub.
> git config --global alias.rmremotebranch "push origin --delete"
*git rmremotebranch <name>* will delete said branch from GitHub.
> git config --global color.ui auto
This adds color to the git output, which some may find useful for eg. *git status*.


On the 1st of September the transitional period starts, and we will begin changing scripts to point to the new code locations.
The transition may be delayed somewhat if the phenix release encounters any delays.

I will send you further updates closer to the day. You can find and comment on the transition plan at
https://docs.google.com/document/d/1bTiGbnvw8lNUrBLbRmhEdnd22McDqBbiKxcpygaZ7JI/edit?usp=sharing

Best wishes

-Markus


-- 
This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail.
Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd. 
Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message.
Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom




More information about the cctbxbb mailing list