Merge-to alias: rollback and fix the real issue

diff --git a/gitconfig.dot.link b/gitconfig.dot.link
index 7703c51cda716b21c2ff5af946b2a2caa694f500..5fcc5d741400c372cd2742eb6c6dc3a477449eea 100644 (file)
--- a/gitconfig.dot.link
+++ b/gitconfig.dot.link
@@ -16,4 +16,4 @@
 [alias]
   # Thanks https://stackoverflow.com/questions/3672073/git-merge-to-another-branch
   #merge-to = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f"
-  merge-to = "!f() { export tmp_branch=`git branch | grep '* ' | tr -d '* ' | tr -d '/'`; git checkout $1 && git merge $tmp_branch && git checkout $tmp_branch; unset $tmp_branch; }; f"
+  merge-to = "!f() { export tmp_branch=`git branch | grep '* ' | tr -d '* '`; git checkout $1 && git merge $tmp_branch && git checkout $tmp_branch; unset tmp_branch; }; f"