diff --git a/.gitignore b/.gitignore index 258d939..ea47a09 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ vim/.netrwhist vim/bundle/* !vim/bundle/Vundle.vim *.pyc +config/openbox/lxde-rc.xml diff --git a/zsh/aliases b/zsh/aliases index 02fad29..f9eb382 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -171,6 +171,7 @@ alias gr='git reset' alias grb='git rebase' alias grba='git rebase --abort' alias grbc='git rebase --continue' +alias grbs='git rebase --skip' alias grbi='git rebase -i' alias grbm='git rebase master' alias grbmi='git rebase master -i'