69:3e6ac54990dd
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 17:55:50 +0800
git prompt: show merges with conflicts

next change 104:6ca1043912e4
previous change 27:b124c75961d1

.bash_aliases

Permissions: -rw-r--r--

Other formats: Feeds:
#!/bin/bash
alias ls="ls --color=auto"
alias grep="grep --color=auto"
alias cal="cal -NM3"
alias pylint-nodoc="pylint --disable=C0111,C0112"
alias whatsopen="lsof -i -P -n -sTCP:LISTEN"