-
-
Save nessamurmur/8283685 to your computer and use it in GitHub Desktop.
Barely modified hack & ship scripts
This file contains hidden or 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
| #!/bin/sh -x | |
| CURRENT=`git branch | grep '\*' | awk '{print $2}'` | |
| git checkout master | |
| git pull origin master | |
| git checkout ${CURRENT} | |
| git rebase master |
This file contains hidden or 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
| #!/bin/sh -x | |
| CURRENT=`git branch | grep '\*' | awk '{print $2}'` | |
| git checkout master | |
| git pull origin master | |
| git checkout ${CURRENT} | |
| git rebase master | |
| git push -u origin ${CURRENT} | |
| hub pull-request |
This file contains hidden or 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
| #!/bin/sh -x | |
| CURRENT=`git branch | grep '\*' | awk '{print $2}'` | |
| git checkout master | |
| git pull origin master | |
| git merge ${CURRENT} | |
| git push origin master | |
| git push origin :${CURRENT} | |
| git branch -D ${CURRENT} |
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The only difference is I want to delete the remote and local branches after I've pushed to master