diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-01-19 12:38:54 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-01-19 12:38:54 -0200 |
| commit | dec428de802cea0945773dc95163e8f81ab441e2 (patch) | |
| tree | 433b0b178cb62111411d9d1ddee02d1265d7a1f6 | |
| parent | 3f22d064ea674c223893fff57a24a89ba299f437 (diff) | |
| download | git-dec428de802cea0945773dc95163e8f81ab441e2.tar.gz git-dec428de802cea0945773dc95163e8f81ab441e2.tar.bz2 | |
Merge-to alias: rollback and fix the real issue
| -rw-r--r-- | gitconfig.dot.link | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitconfig.dot.link b/gitconfig.dot.link index 7703c51..5fcc5d7 100644 --- 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" |