diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2014-12-11 09:48:26 +0900 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2015-06-10 15:43:55 +0900 |
commit | 95c305b77de19d81cc57efd5b03ee629c40911b1 (patch) | |
tree | b24d4b668a1e29af59668085de88d21c3155dce5 | |
parent | 41d0ef552859772ad911e2cd4d841b5053e9666e (diff) | |
download | dotfiles-95c305b77de19d81cc57efd5b03ee629c40911b1.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 caeab731..a32f2369 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 |