summaryrefslogtreecommitdiff
path: root/.emacs.d/eshell
diff options
context:
space:
mode:
authorSean Whitton <spw+git@sdf.org>2014-08-26 19:48:57 +0900
committerSean Whitton <spw+git@sdf.org>2014-08-26 19:48:57 +0900
commit84e4047187db5c30e257fdc84b3487a9a199c52f (patch)
treef16b978677ddd11a3fcab2acebfd072f2ef88a54 /.emacs.d/eshell
parent07659a256d720151f9858a9b48c3a998c81ddb86 (diff)
downloaddotfiles-84e4047187db5c30e257fdc84b3487a9a199c52f.tar.gz
eshell alias to rebase local config branch onto workstation branch onto master
Diffstat (limited to '.emacs.d/eshell')
-rw-r--r--.emacs.d/eshell/alias1
1 files changed, 1 insertions, 0 deletions
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias
index 392db84b..35eaaefc 100644
--- a/.emacs.d/eshell/alias
+++ b/.emacs.d/eshell/alias
@@ -5,3 +5,4 @@ alias d dired $1
alias ga git annex $*
alias blank sleep 1;xset dpms force off
alias docs cd ~/doc;mr autoci;git pull;git push
+alias git-rebase-workstation-on-master git checkout workstation;git rebase master;git checkout ${hostname};git rebase workstation