Created
May 24, 2012 03:09
-
-
Save mgirouard/2779213 to your computer and use it in GitHub Desktop.
Git, Simply.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Create a new project | |
mkdir my-project | |
cd my-project | |
git init | |
echo '.DS_Store' >> .gitignore | |
echo '*.sw*' >> .gitignore | |
git add .gitignore && git commit -m 'First!' | |
git branch development | |
# Set up a development remote | |
git remote add devsite $USER@example.com:my-project.git | |
# Begin a new version | |
git checkout -b v0.1 | |
vim CHANGELOG | |
git add CHANGELOG && git commit -m 'Preparing v0.1' | |
git push origin v0.1 | |
# Work on a new feature | |
git checkout -b ticket-1234-some-bug | |
vim . | |
git add file1 file2 | |
git commit --verbose | |
# Release an issue for testing | |
git checkout development | |
git merge --no-ff -e ticket-1234-some-bug | |
git push devsite +development:master | |
git push origin development | |
# When an issue is approved | |
git checkout v0.1 | |
git merge --no-ff -e ticket-1234-some-bug | |
git tag v0.1-rc1 | |
git push v0.1 origin | |
git push --tags origin | |
# Creating a release | |
git checkout master | |
git merge --no-ff -e v0.1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment