This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
wphase:repository [2015/01/27 10:37] wphase |
wphase:repository [2015/02/03 11:06] (current) wphase |
||
---|---|---|---|
Line 1: | Line 1: | ||
======= Using Git for W-phase ======= | ======= Using Git for W-phase ======= | ||
+ | ===== How to use Git ===== | ||
+ | |||
+ | Instead of repeating things that were said elsewhere, let us just give some pointers: | ||
+ | * [[http://git-scm.com/download|Download Git]] | ||
+ | * [[http://git-scm.com/|Git Community]] | ||
+ | * [[http://schacon.github.com/git/user-manual.html|Git User Manual]] | ||
- | ===== Configure ssh-keys for GitHub ===== | ||
- | https://help.github.com/articles/generating-ssh-keys | ||
===== Make sure your version of Git is OK ===== | ===== Make sure your version of Git is OK ===== | ||
Line 25: | Line 29: | ||
error: The requested URL returned error: 403 while accessing https://github.com/eost/wphase.git/info/refs | error: The requested URL returned error: 403 while accessing https://github.com/eost/wphase.git/info/refs | ||
</code> | </code> | ||
- | please make sure to update git to version 1.7.10 or later (see above), otherwise use | + | please make sure to update git to version 1.7.10 or later (see above). |
- | <code> | + | |
- | git clone https://yourusername@github.com/eost/wphase.git wphase_package | + | |
- | </code> | + | |
===== Regular daily usage: master branch (for regular users) ===== | ===== Regular daily usage: master branch (for regular users) ===== | ||
Line 40: | Line 41: | ||
===== Regular daily usage: develop branch (for developers) ===== | ===== Regular daily usage: develop branch (for developers) ===== | ||
+ | |||
+ | **If you would like to contribute or if you have any questions/suggestions, [[zacharie.duputel@unistra.fr,luis.rivera@unistra.fr|please contact us]].** | ||
* After cloning the repository, one may want to list existing branches | * After cloning the repository, one may want to list existing branches | ||
Line 116: | Line 119: | ||
git merge develop | git merge develop | ||
</code> | </code> | ||
+ | |||
+ | * To create a new version tag, edit "Version: rXXX" in bin/Arguments.py and bin/RUNA3.csh. You should also add the corresponding tag using: | ||
+ | <code> | ||
+ | git tag -a rXXX -m "Short description of this release" | ||
+ | </code> | ||
+ | |||
+ | * Listing the available tags in Git is straightforward. Just type | ||
+ | <code> | ||
+ | git tag | ||
+ | </code> | ||
+ | |||
+ | * You can also see the tag data along with the commit that was tagged by using | ||
+ | <code> | ||
+ | git show r252 | ||
+ | </code> | ||
+ | ===== Configure ssh-keys for GitHub ===== | ||
+ | |||
+ | https://help.github.com/articles/generating-ssh-keys | ||
+ |