From 80fe5040f8e24836380b59153a192abf6fff7df6 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Tue, 18 Jul 2017 12:11:39 -0500
Subject: [PATCH] Add git rebase feature branch alias

---
 shell/aliases | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/shell/aliases b/shell/aliases
index 57cb77c..d034b55 100644
--- a/shell/aliases
+++ b/shell/aliases
@@ -55,6 +55,19 @@ alias gpl="git pull"
 alias gp="git push"
 alias gac="git add -A && git commit"
 
+grb() {
+	MAIN_BRANCH="master"
+	CUR_BRANCH="$(git branch | grep \* | cut -d ' ' -f2-)"
+	if [[ ! -z ${2+x} ]]; then
+		MAIN_BRANCH="$2"
+		CUR_BRANCH="$1"
+	elif [[ ! -z ${1+x} ]]; then
+		MAIN_BRANCH="$1"
+	fi
+
+	git rebase -i $(git merge-base "$CUR_BRANCH" "$MAIN_BRANCH")
+}
+
 # browser aliases
 alias qute="qutebrowser --backend webengine"