free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Abort any merge

This commit is contained in:
Bob Mottram 2016-11-12 10:37:48 +00:00
parent 69bd5d395f
commit 17501e8acc
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/freedombone-utils-git
View File

@ -54,6 +54,7 @@ function git_pull {
echo $'git_pull no repo specified' echo $'git_pull no repo specified'
fi fi
git merge --abort
git stash git stash
git remote set-url origin $1 git remote set-url origin $1
git checkout master git checkout master