Script to switch to master, update it, then merge with branch you were in before.

git-update

#!/bin/bash

echo "Noting which branch you are currently in."
MYBRANCH=`git rev-parse --abbrev-ref HEAD`
echo $MYBRANCH

echo "Updating current branch"
git pull

#echo "Branch list"
#git branch --list
 
echo "Switching to Master"
git checkout master

echo "Updating master branch"
git pull

echo "Switching to previous branch"
git checkout $MYBRANCH

echo "Merging with Master"
git merge master