summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-31 16:58:22 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-31 16:58:22 +0200
commit52e1ba9866dbcca8e1ce631c0cd27a0a5e8eeeb9 (patch)
tree779864330a36420c1f2c3dd8b926f39f69f55969
parentf627d167c1b2b246fab81dd75b4cfea2462d8ee5 (diff)
parent217ddd44b3509820a69168a2f59758a0c6c7333a (diff)
Merge branch '_nb' into nb
-rw-r--r--ikiwiki_nb.setup4
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 3fc16a6..2ed8f9f 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -147,9 +147,9 @@ use IkiWiki::Setup::Standard {
# mode for git_wrapper (can safely be made suid)
git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)
- #historyurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+ #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]]', # ;hb=master
# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
- #diffurl => 'http://' . $githost . '/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+ #diffurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
# where to pull and push changes (set to empty string to disable)
#gitorigin_branch => 'samplewiki',
# branch that the wiki is stored in