updated

2 files changed, 6 insertions, 0 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index e211771..c17a655 100755
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -283,4 +283,9 @@ if [ -s "/usr/local/opt/nvm/nvm.sh" ]; then
     source "/usr/local/opt/nvm/nvm.sh"
 fi
 
+if exists direnv; then
+    eval "$(direnv hook bash)"
+fi
+
+
 # vim: set ts=4 sw=4 tw=0 et :
diff --git a/git/.gitconfig b/git/.gitconfig
index 4f97d85..3e3824b 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -11,6 +11,7 @@
         deploy = "!f() { read -p \"Do you want to push branch $1 to $1/master? [Y/n] \" yn; [ "$yn" == "Y" ] && git push $1{,:master}; }; f"
         cm = commit -m
         ra = "!f() { read -p \"Author email: \" email; [ -n \"${email}\" ] && git config user.email ${email} && git commit --amend --reset-author; }; f"
+        merge-to = "!f() { git checkout $1; git merge -; git checkout -; }; f"
 [push]
         default = simple
 [pull]