Script to fetch any updates and merge it into any currently unincorporated work, then push it.

merge-and-push.sh

#!/bin/bash

set -e

GIT_DIR=$HOME/projects/private_notes

# only do it if we have network
if ping -c1 -w5 -n 8.8.8.8 | grep -q '1 received'; then

    # first fetch updates
    git -C $GIT_DIR fetch -q origin > /dev/null

    if [[ "x$(git -C $GIT_DIR status --porcelain)" == "x" ]]; then
        git -C $GIT_DIR merge origin/master
    fi
    git -C $GIT_DIR fetch -q origin > /dev/null
    git -C $GIT_DIR merge -q -m"Merging in update" origin/master > /dev/null
    git -C $GIT_DIR push -q origin master > /dev/null
fi