Git admin: Difference between revisions
Jump to navigation
Jump to search
(12 intermediate revisions by the same user not shown) | |||
Line 1: | Line 1: | ||
== Useful commands == | == Useful commands == | ||
Make a | Make a remote for the official repository | ||
git | git remote # To see your defined alias for remotes | ||
<nowiki>git remote add pymol https://GIT_USER_NAME@github.com/Pymol-Scripts/Pymol-script-repo.git</nowiki> | |||
When a user make a Pull request, read more here http://help.github.com/send-pull-requests/ | |||
git fetch <nowiki>https://github.com/OTHER_GIT_USER_NAME/Pymol-script-repo master</nowiki> | |||
git log GIT_USER_NAME/master ^master | |||
git checkout GIT_USER_NAME/master # Checkout the changes, try the script. See wikipage | |||
Push the change to the Official repository | |||
git checkout master # Go back to master | |||
git merge GIT_USER_NAME/master # Merge in, and you are ready | |||
git push pymol master # If you are out of date, continue | |||
git fetch pymol master # Get latest from the official rep | |||
git branch -a # See all branches | |||
git merge pymol/master # Merge remote branch into yours | |||
git push pymol master # Push to the original repository | |||
== Zip files == | |||
One can make a zip file of the scripts. | |||
git archive --format zip --output ./Pymol-script-repo.zip master | |||
== Additional reading == | == Additional reading == | ||
For more commands on git, look here: http://cheat.errtheblog.com/s/git | For more commands on git, look here: http://cheat.errtheblog.com/s/git |
Latest revision as of 11:53, 3 December 2011
Useful commands
Make a remote for the official repository
git remote # To see your defined alias for remotes git remote add pymol https://GIT_USER_NAME@github.com/Pymol-Scripts/Pymol-script-repo.git
When a user make a Pull request, read more here http://help.github.com/send-pull-requests/
git fetch https://github.com/OTHER_GIT_USER_NAME/Pymol-script-repo master git log GIT_USER_NAME/master ^master git checkout GIT_USER_NAME/master # Checkout the changes, try the script. See wikipage
Push the change to the Official repository
git checkout master # Go back to master git merge GIT_USER_NAME/master # Merge in, and you are ready git push pymol master # If you are out of date, continue git fetch pymol master # Get latest from the official rep git branch -a # See all branches git merge pymol/master # Merge remote branch into yours git push pymol master # Push to the original repository
Zip files
One can make a zip file of the scripts.
git archive --format zip --output ./Pymol-script-repo.zip master
Additional reading
For more commands on git, look here: http://cheat.errtheblog.com/s/git