-
-
Save joslynesser/567470 to your computer and use it in GitHub Desktop.
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 | |
# hack: Merge the latest changes from the master branch into your current branch | |
ref=$(git symbolic-ref HEAD 2> /dev/null) || exit 0 | |
CURRENT="${ref#refs/heads/}" | |
git checkout development | |
git pull origin development | |
git checkout ${CURRENT} | |
git rebase development |
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 | |
# Git workflow ship script from: http://reinh.com/blog/2008/08/27/hack-and-and-ship.html | |
# git name-rev is fail | |
ref=$(git symbolic-ref HEAD 2> /dev/null) || exit 0 | |
CURRENT="${ref#refs/heads/}" | |
git checkout development | |
git merge ${CURRENT} | |
git push origin development | |
git branch -d ${CURRENT} |
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 | |
# squash: Squash all commits in your current branch into one commit, based on the current state of the development branch | |
git rebase -i development |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment