git-mainline

#!/bin/bash


branch=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')

git fetch
git rebase origin/master
git rebase -i HEAD~`git log origin/master.. --pretty=oneline | wc -l | sed -e 's/^[ \t]*//'`
git push origin $branch --force
git checkout master
git pull
git merge $branch
git log master ^origin/master