From 20a00a8400a0c6d74bc26f3a9152e1e5a5468943 Mon Sep 17 00:00:00 2001
From: Garrit Franke <garritfranke@gmail.com>
Date: Wed, 23 Sep 2020 10:42:26 +0200
Subject: [PATCH] zshrc: add pull_develop function

---
 .zshrc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.zshrc b/.zshrc
index 6c3c6bb..ec5102f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -80,6 +80,25 @@ adb_screenshot() {
     adb shell screencap -p > ~/Desktop/screenshot.png
 }
 
+pull_develop() {
+    CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+    STASHED_CHANGES=$(git stash | wc -w)
+    echo "Changes have been stashed"
+
+    git checkout develop
+    git pull
+    git checkout $CURRENT_BRANCH
+
+    if [ $STASHED_CHANGES -gt 5 ] 
+    then
+        git stash pop
+        echo "Changes have been unstashed"
+    fi
+
+    echo "Pull complete"
+}
+
 # User configuration
 
 # export MANPATH="/usr/local/man:$MANPATH"