Abort any merge

2016-11-12 10:37:48 +00:00 · 2016-11-12 10:37:48 +00:00 · 17501e8acc
parent 69bd5d395f
commit 17501e8acc
1 changed files with 1 additions and 0 deletions
--- a/src/freedombone-utils-git
+++ b/src/freedombone-utils-git
@ -54,6 +54,7 @@ function git_pull {
        echo $'git_pull no repo specified'
    fi

+    git merge --abort
    git stash
    git remote set-url origin $1
    git checkout master