[Scummvm-devel] Merged branch-1-3-0 into master
Marcus Comstedt
marcus at mc.pp.se
Wed Jun 1 17:10:32 CEST 2011
Max Horn <max at quendi.de> writes:
> What I liked about the merge: I made this mistake of merging the Android jni.cpp "#if 0" change. Fuzzie told that it was meant for stable only. I wanted to verify this (not that I was doubting fuzzie, but I was curious). Since it was a merge, "git blame" immediately told me the commit the change came from, the full commit log, and so everything was clear. I am pretty sure this wouldn't have been possible with SVN (and it wouldn't have been possible if I hadn't done this as a merge commit).
I don't quite get the last parenthesis. If you had
cherry-picked/rebased the commit to master instead of merging, then
git blame wouldn't have shown you the commit on the release branch,
but it would have shown you an identical commit with the same author
and log message, so everything would have been just as clear, no?
// Marcus
More information about the Scummvm-devel
mailing list