Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c3accf
)
git: Attribute reverts to the user doing the revert, not the wiki itself
author
Simon McVittie
<smcv@debian.org>
Thu, 29 Dec 2016 20:35:46 +0000
(20:35 +0000)
committer
Simon McVittie
<smcv@debian.org>
Wed, 11 Jan 2017 19:55:09 +0000
(19:55 +0000)
(cherry picked from commit
afda05479645ccf64bc2cb534d023c5a8cb0a5ae
)
IkiWiki/Plugin/git.pm
patch
|
blob
|
history
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 {