git: Attribute reverts to the user doing the revert, not the wiki itself

(cherry picked from commit afda05479645ccf64bc2cb534d023c5a8cb0a5ae)

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index d1cb247de62aabd202806c1df90c1cf2612edc8d..c976ca9a2e22cfdd3e154cbaddd5f3bfb6375f4d 100644 (file)
--- 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 {