diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2015-01-12 17:02:46 +0000 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2015-01-12 17:02:46 +0000 |
commit | 0d037c17f1f8af5f24f66b28ce0d039800a8940e (patch) | |
tree | 636eb31b3c079b6648df8fbe5abd358ed3569bdc /.emacs.d/eshell | |
parent | 20d4cb63754882dca809e50d8122d2cbf11d550c (diff) | |
download | dotfiles-0d037c17f1f8af5f24f66b28ce0d039800a8940e.tar.gz |
Get rid of workstation branch of dotfiles repository, a base for
branches for particular hosts with changes that I want on both zephyr
and artemis. It's only ever have one commit in it.
Diffstat (limited to '.emacs.d/eshell')
-rw-r--r-- | .emacs.d/eshell/alias | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias index 5e6ae2bf..09fc1784 100644 --- a/.emacs.d/eshell/alias +++ b/.emacs.d/eshell/alias @@ -6,8 +6,8 @@ alias ga git annex $* alias blank sleep 1;xset dpms force off alias docs cd ~/doc;mr autoci;git pull;git push alias annex-to-ma cd ~/lib/annex;ga copy -t metaarray --auto --fast -alias git-rebase-workstation-on-master git checkout workstation;git rebase master;git checkout ${hostname};git rebase workstation -alias git-push-workstation-master git push origin master;git push -f origin workstation ${hostname} +alias git-rebase-host-branch git rebase master;git checkout ${hostname};git rebase master +alias git-push-host-branch git push origin master;git push -f origin ${hostname} alias workgit cd ~/doc;git add org/*.org;git commit -a -e -m "work commit";git push alias sonatarc cd ~/src/dotfiles;git checkout .config/sonata/sonatarc;cd - |