diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:58:22 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:58:22 +0200 |
commit | 322f6336529d29390c5b1f76e54ae318ce8b5f1e (patch) | |
tree | bdb2648fc9c23bbec0315bc022e15e97ddad57b8 | |
parent | c21c7fc1a39f6b041fcceffec938602bf98b1f95 (diff) | |
parent | bdc057f3edc154091d8eeec4bedddf230500d170 (diff) |
Merge branch 'master' into _clean
-rw-r--r-- | ikiwiki.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index 9b84bb0..4e74039 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 |