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 | ee8bafd46b52cd6921edb04185c0b37f8c203999 (patch) | |
| tree | 6e2f58d017ea721d7a48c6f19a52ab74e94f701e | |
| parent | f193b8fdad0f2319d99e40dbdf017f589913c5a1 (diff) | |
| parent | bdc057f3edc154091d8eeec4bedddf230500d170 (diff) | |
Merge branch 'master' into _scs
| -rw-r--r-- | ikiwiki.setup | 4 |
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 |