Static generation updates

Makefile

@@ -17,5 +17,5 @@
 wiki:
 	@ikiwiki --setup ikiwiki.setup
 
-deploy:
+wiki_deploy:
 	@rsync -avz --delete www/ blog:/var/sites/rhatto/www/

ikiwiki.setup

@@ -32,6 +32,8 @@ use IkiWiki::Setup::Standard {
   diffurl => "https://git.sarava.org/?p=rhatto.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
 	#gitorigin_branch => "origin",
 	#gitmaster_branch => "master",
+	# See https://ikiwiki.info/tips/laptop_wiki_with_git/
+	gitorigin_branch => '',
 
 	# Tla stuff.
 	#rcs => "tla"
@@ -45,7 +47,7 @@ use IkiWiki::Setup::Standard {
 
 	# Bazaar stuff.
 	#rcs => "bzr",
-	#historyurl => "", 
+	#historyurl => "",
 	#diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
 
 	# Monotone stuff
@@ -144,10 +146,10 @@ use IkiWiki::Setup::Standard {
 	# To add plugins, list them here.
 	#add_plugins => [qw{goodstuff search wikitext camelcase
 	#                   htmltidy fortune sidebar map rst anonok}],
-  add_plugins => [qw{goodstuff sidebar}],  
+  add_plugins => [qw{goodstuff sidebar}],
 	# If you want to disable any of the default plugins, list them here.
 	#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-  disable_plugins => [qw{openid editpage}],  
+  disable_plugins => [qw{openid editpage}],
 	# To add a directory to the perl search path, use this.
 	#libdir => "/home/me/.ikiwiki/",