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 | 80412957eabd78ce4a0862a678aa0c7f8aeb7668 (patch) | |
tree | 7cc93c634a598f46bc4b1636d7d6c915be2582be | |
parent | eda71b62ac34cea62eb9745283443a7813fd383f (diff) | |
parent | a28dd0655a7a3ae6acc3e7762f3638c734073eca (diff) |
Merge branch '_da' into da
-rw-r--r-- | ikiwiki_da.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 58e2d5c..30cd3c7 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 |