git ssb - Allow merge · cel/ssbc/docs@de3fa79b

cel committed on 12/21/2019, 1:14:43 AM
Parent: 68b5c33864b7c09589fc2c793aecefdacff94d9c

changed

scripts/build-gh-pages.shView
		@@ -1,6 +1,6 @@
1	1 …	#!/bin/sh
2	2 …	set -ex
3	3 …	git checkout gh-pages
4		-git merge master --no-commit
	4 …	+git merge master --no-commit \|\| true
5	5 …	ssbc-sitegen docs
6	6 …	git commit -am build

cel / ssbc/docs