#!/usr/bin/env bash set -o errexit -o nounset -o pipefail eval "$@" scriptDir="$(cd "$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" && pwd)" # develope on `deflDev`. All system tools use `defl`. Once testing on `deflDev` is production ready. Use this script to push `deflDev/development` to `defl/master`. gitx() ( set -x git "$@" ) if gitx -C /home/a/deflDev status --porcelain | grep . --color; then echo 'branch is dirty' exit 1 fi gitx -C /home/a/deflDev fetch gitx -C /home/a/deflDev checkout development gitx -C /home/a/deflDev pull gitx -C /home/a/deflDev merge origin/master gitx -C /home/a/deflDev push gitx -C /home/a/deflDev branch --delete master 2>&1 | grep -v "error: branch 'master' not found" -F || true gitx -C /home/a/defl fetch gitx -C /home/a/defl checkout master gitx -C /home/a/defl pull gitx -C /home/a/defl merge --strategy-option theirs origin/development gitx -C /home/a/defl push gitx -C /home/a/defl branch --delete development 2>&1 | grep -v "error: branch 'development' not found" -F || true