Created
June 4, 2011 14:43
-
-
Save mnogu/1007947 to your computer and use it in GitHub Desktop.
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
### my commits ### | |
git checkout master | |
# at master | |
git branch | |
git commit -av | |
git push git@github.com:mnogu/uim.git | |
git checkout uim-trunk | |
# at uim-trunk | |
git merge master | |
git rebase trunk | |
git svn dcommit | |
git push git@github.com:mnogu/uim.git | |
git checkout uim-x.x | |
# at uim-x.x | |
git cherry-pick abcdef | |
git cherry-pick ghijkl | |
git cherry pick mnopqr | |
git rebase -i HEAD~3 | |
#git commit --amend | |
git svn dcommit | |
git push git@github.com:mnogu/uim.git | |
### others' commits ### | |
git svn fetch | |
git checkout uim-trunk | |
# at uim-trunk | |
git pull | |
git checkout master | |
# at master | |
git merge uim-trunk | |
git push |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment