summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bashrc1
-rw-r--r--.emacs.d/eshell/alias2
-rw-r--r--.zshrc1
-rw-r--r--home-mrconfig5
4 files changed, 7 insertions, 2 deletions
diff --git a/.bashrc b/.bashrc
index 535f6422..445cc5d5 100644
--- a/.bashrc
+++ b/.bashrc
@@ -64,3 +64,4 @@ alias g='git'
alias ga='git annex'
alias workgit='cd ~/doc && git add . && git commit -a -m "work commit" --edit && git push origin master && cd ~/src/dotfiles && git push origin master'
alias mg=$EDITOR
+alias fmr='MR_FAST=true mr'
diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias
index a3fc870b..48e911c2 100644
--- a/.emacs.d/eshell/alias
+++ b/.emacs.d/eshell/alias
@@ -3,6 +3,8 @@ alias mg find-file $1
alias g git $*
alias d dired $1
alias ga git annex $*
+alias fmr MR_FAST=true mr
+
alias blank sleep 1;xset dpms force off
alias docs cd ~/doc && mr sync
alias annex-to-ma cd ~/lib/annex;ga copy -t metaarray --auto --fast
diff --git a/.zshrc b/.zshrc
index 6a85b132..9566922a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -46,6 +46,7 @@ alias g="git"
alias ga="git annex"
alias gs="git status"
alias pg="ps auxxxxxxxxxxxxxxxxxxx | grep"
+alias fmr="MR_FAST=true mr"
alias fixmpd="sudo invoke-rc.d mpd restart; pkill sonata"
alias radio4="mplayer \"http://wmlive-acl.bbc.co.uk/wms/bbc_ami/radio4/radio4_bb_live_eq1_sl0?BBC-UID=044be39365f98aaa88a55ca7f1aa8fc5b3569ae000708114d4dfd43698a07e8a&SSO2-UID=\""
diff --git a/home-mrconfig b/home-mrconfig
index ce7f4c2f..98d95d61 100644
--- a/home-mrconfig
+++ b/home-mrconfig
@@ -283,8 +283,9 @@ sync =
git annex sync --content ma
fi
-# manual checkouts only
-skip = lazy
+# manual checkouts only, and skip when we're in a hurry and used 'fmr'
+# instead of 'mr'
+skip = lazy || $MR_FAST
# --- git annex for use with rtorrent