Abort any merge · 17501e8acc - Brendan Abolivier · Gitea

Abort any merge

Bob Mottram 8 years ago

parent

69bd5d395f

commit

17501e8acc

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
src/freedombone-utils-gitView File
								
				@@ -54,6 +54,7 @@ function git_pull {
			
				54
			
				54
			
				         echo $'git_pull no repo specified'
			
				55
			
				55
			
				     fi
			
				56
			
				56
			
				57
			
				+    git merge --abort
			
				57
			
				58
			
				     git stash
			
				58
			
				59
			
				     git remote set-url origin $1
			
				59
			
				60
			
				     git checkout master