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 | 217ddd44b3509820a69168a2f59758a0c6c7333a (patch) | |
| tree | 7d832b345024a1dafd3412d04e6f5f1d9348888c | |
| parent | 3193f788b1f31c87040d59ca8915d31bb23deab5 (diff) | |
| parent | bdc057f3edc154091d8eeec4bedddf230500d170 (diff) | |
Merge branch 'master' into _nb
| -rw-r--r-- | ikiwiki_nb.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 7d8ceff..d8010b9 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.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 |