summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-27 23:56:17 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-27 23:56:17 +0000
commit72dbbe3a2cc3550a2aaaf226fd561c0d5064b5b4 (patch)
treee015170eb18fea6ae15836c8221455b729953f4a /doc
parente177dc187ba4d9a48cd18ae1888e7abcbf61fb22 (diff)
* Make gitorigin_branch and gitmaster_branch configurable via the setup
file. Closes: #408599
Diffstat (limited to 'doc')
-rw-r--r--doc/ikiwiki.setup2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index af60e076b..910b2b527 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -29,6 +29,8 @@ use IkiWiki::Setup::Standard {
#rcs => "git",
#historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
#diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+ #gitorigin_branch => "origin",
+ #gitmaster_branch => "master",
# Tla stuff.
#rcs => "tla"