Created
February 19, 2013 16:45
-
-
Save tmacam/4987596 to your computer and use it in GitHub Desktop.
Syncs your git repo and your local copy with the upstream version.
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 | |
set -e | |
press_enter() { | |
set +x | |
echo "PRESS [ENTER]"; | |
read ENTER; | |
set -x | |
} | |
set -x | |
git checkout master | |
git fetch upstream | |
#press_enter; | |
git merge upstream/master | |
#press_enter; | |
git push | |
#press_enter; | |
git pull | |
#press_enter; | |
set +x | |
echo "Don't forget to rebase the unmerged branches:" | |
git branch --no-merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment