-
-
Save cr3a7ure/a6b7bb5ce33590bdfefb79afbdd59ad8 to your computer and use it in GitHub Desktop.
Merge master into current 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 | |
CURRENT=`git branch | grep "*" | awk '{print $2}'` | |
git checkout master | |
git fetch | |
git merge origin/master | |
git checkout ${CURRENT} | |
git merge master ${CURRENT} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment