diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-01-09 23:34:42 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-01-09 23:34:42 +0100 |
commit | f3df65ce34153357d28bee621bdf49b61e68b182 (patch) | |
tree | 25ac416b157b010ca2f942dac5c5ba0b38a924ac /ikiwiki.setup | |
parent | 09184ae09c44c052a207aa5c6dc8ce9cf61a343f (diff) | |
parent | 3bbe62327128ce85829a4cb2fb429bd8f21b4d75 (diff) |
Merge branch 'master' of flubber:~hurd-web/hurd-web
Diffstat (limited to 'ikiwiki.setup')
-rw-r--r-- | ikiwiki.setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index 4c61028f..3ef1bb73 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -136,9 +136,9 @@ IkiWiki::Setup::Standard->import({ # unix users whose commits should be checked by the pre-receive hook #untrusted_committers => [], # gitweb url to show file history ([[file]] substituted) - historyurl => 'http://www.bddebian.com:8888/gitweb/?p=hurd-web;a=history;f=[[file]]', + historyurl => 'http://www.bddebian.com:8888/gitweb/?p=hurd-web;a=history;f=[[file]];hb=HEAD', # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) - diffurl => 'http://www.bddebian.com:8888/gitweb/?p=hurd-web;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]', + diffurl => 'http://www.bddebian.com:8888/gitweb/?p=hurd-web;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]', # where to pull and push changes (set to empty string to disable) gitorigin_branch => $gitorigin_branch, # branch that the wiki is stored in |