Just fetch and overwrite from origin rather than merging.

Signed-off-by: Holger Levsen <holger@layer-acht.org>

bin/janitor_setup_worker.sh

@@ -25,8 +25,7 @@ else
 	pushd $TARGET/debian-janitor
 	git status || /bin/true
 	git fetch
-	git reset --hard HEAD
-	git merge origin/master
+	git reset --hard origin/master
 	git submodule update --init
 	popd
 fi