I know from reading the teachings of Jesus that he taught a non-violent religion. Turn the other cheek, go the extra mile, clothe the naked, feed the hungry, etc. Unfortunately, like all of the religions at points and times, it has been co-opted by the powers that be to manipulate the masses into doing things contrary to Jesus' teachings in his name. According to Jesus' teachings, following him is non-violent.
I responded using non-violent rather than peaceful because at times we will rock the boat (through non-violent means) if we are truly following Jesus and caring for the things that he instructed us to care for. We should not be able to see oppression and just let it go. We are willing to die but not kill.