script to make linear history (fast forward) in git

This commit is contained in:
Roman Ivanov 2014-03-23 16:04:04 -07:00
parent 19b80e2938
commit e82a3d217c
1 changed files with 37 additions and 0 deletions

37
fast-forward-merge.sh Executable file
View File

@ -0,0 +1,37 @@
#!/usr/bin/env bash
if [ $# -eq 0 ]
then
echo "$(basename "$0") GIT_REPO FORK_USER_NAME USER_BRANCH
example:
./$(basename "$0") checkstyle konstantinos issue73
"
exit 0;
fi
GIT_REPO=$1
FORK_USER_NAME=$2
USER_BRANCH=$3
REPO=$FORK_USER_NAME-fork
LOCAL_USER_BRANCH=$FORK_USER_NAME-$USER_BRANCH
echo "adding remote ..."
git remote add $REPO https://github.com/$FORK_USER_NAME/$GIT_REPO.git
git fetch $REPO
echo "creating local branch ..."
git checkout -b $LOCAL_USER_BRANCH $REPO/$USER_BRANCH
echo "rebasing over master ..."
git rebase master
echo "merge to master ..."
git checkout master
git merge $LOCAL_USER_BRANCH
echo "removing local branch ..."
git branch -D $LOCAL_USER_BRANCH
echo "removing remote ..."
git remote rm $REPO