diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2014-12-11 09:48:26 +0900 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2015-05-26 08:42:25 +0900 |
commit | 4e1bdf327bf3d32f7a13ac13d8257ea86aea554f (patch) | |
tree | 993193484356f54581aa226aed618522a2686ddd | |
parent | 0bb92d6f372b31f05c0d8205d986354ae864145f (diff) | |
download | dotfiles-4e1bdf327bf3d32f7a13ac13d8257ea86aea554f.tar.gz |
command to stash changes and apply to master branch since Windows git version isn't very good at switching branches
-rw-r--r-- | .emacs.d/eshell/alias | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias index 6203e20e..820db192 100644 --- a/.emacs.d/eshell/alias +++ b/.emacs.d/eshell/alias @@ -9,6 +9,7 @@ alias annex-to-ma cd ~/lib/annex;ga copy -t metaarray --auto --fast alias git-rebase-win32-on-master git checkout win32;git rebase master alias git-push-win32-master git push origin master;git push -f origin win32 alias git-dotfiles git-rebase-win32-on-master && git-push-win32-master +alias git-stash-to-master git stash && git checkout master && git stash pop 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 - alias newtorrents mv ~/tmp/*.torrent ~/local/rt/watch |