Merge branch 'master' of https://github.com/mastermindzh/dotfiles

bash/.alias.sh

@@ -29,6 +29,7 @@ alias psmem='ps auxf | sort -nr -k 5 | head -n 5'
 #dotnet core
 alias efupdate="dotnet ef database update"
 alias efmigrate="dotnet ef migrations add"
+alias efremove="dotnet ef migrations remove"
 alias dotnetnew="dotnet new webapi -o "
 
 ##utility
@@ -57,11 +58,16 @@ alias cmyip='curl -s http://ipecho.net/plain; echo'
 alias mkdir='mkdir -p'
 alias wget='wget -c'
 alias ls='ls --color=auto'
+alias installed='sudo pacman -Qetq'
+alias aurinstalled='sudo pacman -Qmq'
 alias sudo='sudo '
 
 # grub
 alias update-grub='grub-mkconfig -o /boot/grub/grub.cfg'
 
+# git
+alias gitremovelocalbranches='git branch --merged | egrep -v "(^\*|master|dev)" | xargs git branch -d'
+
 ## Functions
 
 # function to cd up a couple of times
@@ -117,3 +123,12 @@ isup(){
 printLine(){
     printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' -
 }
+
+# function to kill a port
+killport () {
+    if [ -z "$1" ] ; then
+        echo "please specify a port to kill"
+    else
+        fuser -k $1/tcp
+    fi
+}

config/.gitconfig

@@ -7,3 +7,4 @@
 	stats = !git graph --stat
 	pushall = !git remote | xargs -L1 git push --all
 	diffname = !git diff --name-only
+	undocommit = reset --soft HEAD~1