Forked from jmeridth/.rebase.sh and .finishrebase.sh
Created
January 19, 2012 19:45
-
-
Save dustinchilson/1642119 to your computer and use it in GitHub Desktop.
Modified bash scripts to speed up rebasing for use with git-tfs
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
# REBASE | |
#!/bin/bash | |
if [ $# -eq 1 ] | |
then | |
git checkout master && git tfs fetch && git rebase HEAD && git checkout $1 && git rebase -i master | |
else | |
echo 'Please provide a feature branch: ./rebase.sh feature1324' | |
fi | |
#FINISH REBASE | |
#!/bin/bash | |
if [ $# -eq 1 ] | |
then | |
git checkout master && git merge $1 && git tfs checkintool --build-default-comment | |
else | |
echo 'Please provide a feature branch: ./finishrebase.sh feature1324' | |
fi |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment