From a241942f17b8ffbc0d4f3251aad00708271b8344 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 29 Dec 2016 20:35:46 +0000 Subject: [PATCH 1/1] git: Attribute reverts to the user doing the revert, not the wiki itself (cherry picked from commit afda05479645ccf64bc2cb534d023c5a8cb0a5ae) --- IkiWiki/Plugin/git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index d1cb247de..c976ca9a2 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 { -- 2.39.5