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
commit31bbfbe2f9a731dd7d51fb583f4d1f1347b53bfa (patch)
tree95f4c42f1f5bb8321147a27f2020ff485f26a973
parent00f1ee613a003929260248edf5fb8603cb51f521 (diff)
parentee8bafd46b52cd6921edb04185c0b37f8c203999 (diff)
Merge branch '_scs' into scs
-rw-r--r--ikiwiki.setup4
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup
index faaeacb..0193f6f 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.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