aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-24 06:18:19 -0400
committerJoey Hess <joey@kitenet.net>2010-07-24 06:18:19 -0400
commita7454c0e3220153a1f770df796e45ef1c1ee95ae (patch)
tree35264c70200bd6919d4e58c1645dd45a447f00ee
parentcab8a795682bcac2e937461d9a7d2c683cdc5ed0 (diff)
downloadikiwiki-a7454c0e3220153a1f770df796e45ef1c1ee95ae.tar
ikiwiki-a7454c0e3220153a1f770df796e45ef1c1ee95ae.tar.gz
git: Fix gitweb historyurl examples so "diff to current" links work. (Thanks jrayhawk)
-rw-r--r--IkiWiki/Plugin/git.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index cb3437e18..899ac4a85 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -109,7 +109,7 @@ sub getsetup () {
},
historyurl => {
type => "string",
- example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
+ example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=HEAD",
description => "gitweb url to show file history ([[file]] substituted)",
safe => 1,
rebuild => 1,
diff --git a/debian/changelog b/debian/changelog
index 0f6a7c810..b6a783787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
* template: Fix dependency tracking. Broken in version 3.20100427.
* po: The po_slave_languages setting is now a list, so the order of
translated languages can be controlled. (intrigeri)
+ * git: Fix gitweb historyurl examples so "diff to current" links work.
+ (Thanks jrayhawk)
-- Joey Hess <joeyh@debian.org> Fri, 23 Jul 2010 14:00:32 -0400