Commit bb440b1d authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge origin/master with upstream (if different)

parent fcf1fbba

.shell/funcs

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ update_worktree() 
		return 0

	fi

	local original=`git rev-parse HEAD`

	if git merge --ff --no-edit $upstream; then

	if git merge --ff --no-edit $upstream origin/master; then

		git submodule sync --recursive

		git submodule update --init --recursive

	else