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

commit-update.sh

#!/bin/bash

set -e

GIT_DIR=$HOME/projects/private_notes

# 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
    exit 0
fi
git -C $GIT_DIR add -A
git -C $GIT_DIR commit -q -am "update $(date)" > /dev/null || exit 0
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