Correct: just do `git co origin/master -- interpreter/cling/lib/Interpreter/Interpreter.cpp; git commit interpreter/cling/lib/Interpreter/Interpreter.cpp -m 'Revert'; git rebase -i HEAD~2` and mark that commit as fixup.