updated git and svn aliases and set push current in gitconfig

bash/bash_aliases.d/git.sh

@@ -1,18 +1,18 @@
 alias gf='git fetch'
-alias gs='git status -sb'
+alias gl='git log'
-alias ga='git add'
+alias gs='git status -s'
-alias gaa='git add --all'
+alias ga='git add -p'
+alias gaa='git add'
 alias gu='git add -u'
 alias gc='git commit -v'
 alias gca='git commit -v -a'
 alias gp='git push'
 alias gpl='git pull --rebase'
+alias gplnr='git pull'
 alias gme='git merge'
 alias gb='git branch'
 alias gst='git stash'
 alias gco='git checkout'
-alias gst='git stash'
 alias gr='git remote'
 alias gd='git diff'
 alias gph='git push heroku'
-alias gl='git log'

bash/bash_aliases.d/svn.sh

@@ -3,3 +3,5 @@ alias sd='svn diff -x -w'
 alias ss='svn status'
 alias sr='svn revert'
 alias sc='svn commit'
+alias sl='svn log -l 14'
+alias sup='svn up'

git/gitconfig

@@ -33,4 +33,4 @@
 [merge]
     tool = vimdiff
 [push]
-    default = tracking
+    default = current