enhancing zsh, git & aliases

.bash_aliases

@@ -22,7 +22,7 @@ fi
 
 alias la='ls -la'
 alias l='ls -la'
-alias ls='ls -h --color --group-directories-first' 
+alias ls='ls -h --color --group-directories-first'
 alias lsa='ls -A'           # affiche les fichiers cachés
 alias ll='ls -lh'           # affiche en mode liste détail
 alias lla='ls -Al'          # affiche en mode liste détail + fichiers cachés
@@ -45,7 +45,7 @@ alias realtimemodifiedfiles="watch -d -n 2 'df; ls -FlAt;'"
 alias du='du -kh'
 alias taille='du -chs'
 alias combien='ls -l | grep -v ^l | wc -l'
-alias chch='sudo chmod 775 * -R && sudo chown ronan:www-data * -R'
+alias chch='sudo chmod 775 * -R && sudo chown $USER:www-data * -R'
 
 # -------------------- archiver aliases -------------------
 
@@ -88,7 +88,8 @@ alias menageup='sudo apt-get clean && sudo apt-get autoclean && sudo apt-get aut
 # -------------------- GIT / SVN related aliases --------------------
 
 alias git2cl='git log --graph --pretty=medium --color=never > CHANGELOG'
-alias gitinfo='. /home/ronan/Bin/sh/gitinfo.sh'
+alias gitlog='git log --all --color --decorate --graph --oneline'
+alias gitinfo='. /home/$USER/Bin/sh/gitinfo.sh'
 alias gitignore='cat .gitignore'
 alias gap='git add -p'
 alias gpo='git push origin '
@@ -121,6 +122,7 @@ alias allIps='for ip in $(seq 1 254); do ping -c 1 192.168.1.$ip>/dev/null; [ $?
 # #   sleep 10; alert
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 alias wtf='tail -f /var/log/{dmesg,messages,*{,/*}{log,err}}'
+alias apps='cd /Apps'
 
 # -------------------- PHP/Sf1/Sf2/Behat related aliases --------------------
 

.bashrc

@@ -190,3 +190,4 @@ function dataurl() {
     fi
     echo "data:${mimeType};base64,$(openssl base64 -in "$1" | tr -d '\n')"
 }
+source /home/vagrant/oh-my-git/prompt.sh

.gitconfig

@@ -11,7 +11,7 @@
     last = log --name-status HEAD^..HEAD
     logp="log --pretty=oneline -n 20 --graph --abbrev-commit"
     co = checkout
-    br = branch
+    br = branch -a -vv
     unstage = reset HEAD --
     lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
     hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short

.vimrc

@@ -89,7 +89,7 @@ let g:solarized_visibility = "normal"
 syntax enable
 set background=dark
 "colorscheme solarized
-colorscheme default
+colorscheme slate
 " option name default optional
 " ------------------------------------------------