diff options
Diffstat (limited to 'IkiWiki/Plugin/git.pm')
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 2 |
1 files changed, 1 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 { |