merge-github

#!/bin/bash

if [ -z "${1}" ]
then
    echo "Please provide usernam:branch of your fork."
    exit 1
else
    fork_user=$(echo ${1} | cut -d ":" -f 1)
    fork_branch=$(echo ${1} | cut -d ":" -f 2)
fi

if [ -z $fork_user -o -z fork_branch ]
then
    echo "Please provide usernam:branch of your fork."
else
    git checkout master
    git pull upstream master
    git merge -S --no-ff $fork_user-$fork_branch -m "Merge branch '$fork_user-$fork_branch'" -m "Signed-off-by: $(git config --get user.name) <$(git config --get user.email)>"
fi