Shortcut for pushing and tracking current branch

Author: HighwayofLife

README.md

@@ -27,6 +27,18 @@ Commands
 * `git merge-branch` - Pull-Request Merge current Branch to Master
 * `git create-pr` - Shortcut to push branch and create a pull-request
 
+Helpful Aliases
+---------------
+Add the following aliases to `.bashrc`, `.bash_profile`, or `.zshrc`
+
+```sh
+alias pr="git create-pr"
+alias push="git push-branch"
+alias merge="git merge-branch"
+alias pr-merge="git merge-pr"
+```
+
+
 Contributors
 ------------
 

git-push-branch

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+function usage() {
+  bold=$(tput bold)
+  normal=$(tput sgr0)
+  cat << EOF
+
+${bold}NAME${normal}
+       git-push-branch - Push the current branch and track remote
+
+${bold}SYNOPSIS${normal}
+       git push-branch
+
+EOF
+}
+
+# actually parse the options and do stuff
+while [[ $1 = -?* ]]; do
+  case $1 in
+    -h|--help)
+      usage
+      exit 0
+    ;;
+    *) ;;
+  esac
+  shift
+done
+
+branch=$(git rev-parse --abbrev-ref HEAD)
+upstream=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null)
+
+if [[ $? == 0 ]]; then
+  echo "branch '$branch' tracks '$upstream'"
+  git push
+else
+  echo "branch '$branch' has no upstream configured"
+  git push -u origin $branch
+fi
+
+