summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2014-12-11 09:48:26 +0900
committerSean Whitton <spwhitton@spwhitton.name>2015-06-08 08:33:56 +0900
commit9f2ea88a58b1d69b7a86be6025ece1a43e722121 (patch)
treec311f2f76f1ec1df8aa1dace725e51399bc4ed9c
parent9b781f1e5a982cb822c8a3b0950c2c42819b0903 (diff)
downloaddotfiles-9f2ea88a58b1d69b7a86be6025ece1a43e722121.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/alias1
1 files changed, 1 insertions, 0 deletions
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias
index 526cd18a..b6069edb 100644
--- a/.emacs.d/eshell/alias
+++ b/.emacs.d/eshell/alias
@@ -11,6 +11,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