Merge branch 'master' of ssh://localhost:8480/nojhan/dotfiles

This commit is contained in:
Johann Dreo 2013-01-31 11:49:57 +01:00
commit a726149f59

View file

@ -159,8 +159,15 @@ alias cgcc="colout :[0-9]+: yellow standard | colout error | colout warning mage
alias git_remotes="grep -A 2 \"\[remote\" .git/config|grep -v fetch|sed \"s/\[remote \\\"//\"|sed ':a;N;\$!ba;s/\"\]\n\s*url = /\t/g'"
# Pretty git log
alias gitlog="git log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
alias git_log="git log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
function git_ignore()
{
if [[ ! -f .gitignore ]] ; then
echo ".gitignore" > .gitignore
fi
git ls-files --other --exclude-standard >> .gitignore
}
#################
# Configuration #