Created
September 9, 2008 21:43
-
-
Save chris/9772 to your computer and use it in GitHub Desktop.
"hack" script for integrating changes into your working git branch
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
#!/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 master | |
git pull origin master | |
git checkout ${CURRENT} | |
git rebase master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment