diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:59:08 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:59:08 +0200 |
| commit | 598698c6fc8699d69e9f5799e7f3663d3fd9c1d0 (patch) | |
| tree | 8528c3aa002904e25a8493a6a146470a3c8d9e44 | |
| parent | e21cb3e0d708449b29d0ab9b66e4f7b25aaefe8a (diff) | |
| parent | a28dd0655a7a3ae6acc3e7762f3638c734073eca (diff) | |
Merge branch '_da' into allinone-da
Conflicts (manually resolved):
ikiwiki_da.setup
| -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 91a5651..9d7485d 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -152,9 +152,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-da', + #historyurl => 'http://' . $githost . '/gitweb.cgi?p=' . $gitrepo . '.git;a=history;f=[[file]];hb=master-da', # 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 |