Created
March 1, 2017 22:54
-
-
Save thebnich/4f054fe719774b5a58c36a3217065de0 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
#!/usr/bin/env sh | |
set -e | |
if [ "$#" -ne 1 ] | |
then | |
echo "Wrong number of arguments. Should be 1, was $#"; | |
exit 1; | |
fi | |
git push -f thebnich $1:$1 | |
git push mozilla master | |
git push thebnich :$1 | |
git branch -d $1 |
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
#!/usr/bin/env sh | |
set -e | |
if [ "$#" -lt 2 ] | |
then | |
echo "Wrong number of arguments. Should be 2-3, was $#"; | |
exit 1; | |
fi | |
git checkout $1 | |
git rebase master | |
git checkout master | |
git merge --no-ff $1 -m "Merge pull request #$2 | |
$3" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Also, you could do this as a git alias if you'd like. For example, my "reset/checkout" alias, for merging pbxproj:
rco = "!f() { git reset $1 && git checkout $1; }; f"