diff options
| author | Simon McVittie <smcv@debian.org> | 2016-12-29 20:35:46 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2016-12-29 20:43:15 +0000 |
| commit | afda05479645ccf64bc2cb534d023c5a8cb0a5ae (patch) | |
| tree | f62d6e02189aa1ee0ebd9817c980cc89cafe54a6 /IkiWiki/Plugin | |
| parent | 04e322fd6b1160608a1e957cde5c7ad6b56eb137 (diff) | |
| download | ikiwiki-afda05479645ccf64bc2cb534d023c5a8cb0a5ae.tar ikiwiki-afda05479645ccf64bc2cb534d023c5a8cb0a5ae.tar.gz | |
git: Attribute reverts to the user doing the revert, not the wiki itself
Diffstat (limited to 'IkiWiki/Plugin')
| -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 { |