projects / moodle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f2304bf) | patch
NOBUG: Fixup commit to fix stuff wrongly changed on merge commits
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:35:13 +0000 (11:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 17:52:25 +0000 (18:52 +0100)
commitef53650e8a9e6d686852ab6fd89f5ecd81a0ca1e
treec6e75739fba93b07419c424ea014d5e900fbabc5tree | snapshot
parentf2304bfb81b2f3c22bf7704d72a0857fec66981ccommit | diff
NOBUG: Fixup commit to fix stuff wrongly changed on merge commits

On rewriting MDL-47491, we ended in a situation where these
modifications had been incorporated via merge commits. And kept
undetected by rebase -ip.

In general, please, use merge commits only for solving conflicts,
never as a replacement for fixup commits. To fix non-conflicting
things, add new, proper, fixup commits.
lib/deprecatedlib.php diff | blob | blame | history
version.php diff | blob | blame | history
Moodle official production repository