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
commita28dd0655a7a3ae6acc3e7762f3638c734073eca (patch)
treeb6fe2a5ca8048031ba0d2cc66a4e82c5866dd471
parentf9c032c24d8f02e3029094c40b20b3938b804a26 (diff)
parentbdc057f3edc154091d8eeec4bedddf230500d170 (diff)
Merge branch 'master' into _da
-rw-r--r--ikiwiki_da.setup4
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup
index 30ad730..816911c 100644
--- a/ikiwiki_da.setup
+++ b/ikiwiki_da.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