add git utility command alias

jays1204 · Mar 30, 2018 · 6a47fd4 · 6a47fd4
1 parent 4d0b40c
commit 6a47fd4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 32 deletions.
diff --git a/.synergy.conf b/.synergy.conf
diff --git a/.zshrc b/.zshrc
@@ -104,3 +104,6 @@ alias "lst=lsof -iTCP -sTCP:LISTEN -n -P"
 alias cpwd="pwd | tr -d '\n' | pbcopy"
 
 eval "$(thefuck --alias)"
+
+alias "cleanBranch=git branch --merged | egrep -v "(^\*|master|dev)" | xargs git branch -d"
+alias "revertGit=~/Utils/scripts/revertGit.sh"
diff --git a/revertGit.sh b/revertGit.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+tag=${1}
+
+git checkout ${tag}
+git diff master > /Users/jays/Utils/scripts/temp/diff.patch
+git checkout master
+cat /Users/jays/Utils/scripts/temp/diff.patch | git apply
+git commit -am "Rolled back to version ${tag}"
+#git push origin master
diff --git a/setupConfig.sh b/setupConfig.sh
@@ -12,4 +12,7 @@ cp .zshrc ~/.zshrc
 defaults write NSGlobalDomain KeyRepeat -float 1.8
 defaults write NSGlobalDomain InitialKeyRepeat -int 13
 
+mkdir -p ~/Utils/script
+
+cp ./revertGit.sh ~/Utils/script/
 source ~/.bashrc