Commit 5c406280 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix exit code of update_worktree

parent 33b4aea8

.shell/funcs

+1 −1
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ update_worktree() 
		else

			git commit-tree "$@"

		fi' $upstream..HEAD

	test -n "$stash" && git stash apply $stash

	git merge --ff-only $upstream || git reset $original

	git stash apply $stash

}



update_submodules()