Permalink
Browse files

Merge branch 'master' of github.com:svenstaro/dotfiles

  • Loading branch information...
svenstaro committed Mar 17, 2013
2 parents 1d0d786 + bf72e0c commit 1e921cf2af326eaafc3338f779f53a8ed03988d4
Showing with 6 additions and 0 deletions.
  1. +3 −0 .bashrc
  2. +3 −0 .gitconfig
View
@@ -4,6 +4,7 @@
alias ls='ls --color=auto'
alias ll='ls -lh --color=auto'
alias grep='grep --color=auto'
+alias sys='sudo systemctl'
if [[ $(which pacman-color 2> /dev/null) ]]; then
alias pacman='pacman-color'
@@ -37,6 +38,8 @@ complete -cf sudo
export EDITOR=vim
alias sharedir='python -m http.server'
+alias irc='ssh apoc -t "tmux attach"'
+
if [[ -n "$DISPLAY" ]]; then
BROWSER=chromium
fi
View
@@ -10,3 +10,6 @@
[alias]
lg = log --graph --all --format=format:'%C(yellow)%h%C(reset) - %C(cyan)%ci%C(reset) %C(green)(%cr)%C(reset) %C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(bold white)- %cn%C(reset)%n' --abbrev-commit --date=relative
+
+[push]
+ default = simple

0 comments on commit 1e921cf

Please sign in to comment.