diff options
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 0ee49416b..3248f9d8f 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -1099,7 +1099,7 @@ sub rcs_revert ($) { ensure_committer(); - if (run_or_non('git', 'merge', '--ff-only', "ikiwiki_revert_$sha1")) { + if (run_or_non('git', 'cherry-pick', '--no-commit', "ikiwiki_revert_$sha1")) { return undef; } else { diff --git a/debian/changelog b/debian/changelog index cd7e158a7..92d1b5697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20161229.1) UNRELEASED; urgency=medium + + * git: Attribute reverts to the user doing the revert, not the wiki + itself. + + -- Simon McVittie <smcv@debian.org> Thu, 29 Dec 2016 20:35:51 +0000 + ikiwiki (3.20161229) unstable; urgency=medium * Security: force CGI::FormBuilder->field to scalar context where |