Jihad literally means to "struggle in the way of God" or "to struggle to improve one's self and/or society". It is sometimes referred to as the sixth pillar of Islam, although it occupies no official status as such. Within Islamic jurisprudence, jihad is usually taken to mean military exertion against non-Muslim combatants.
A holy war is a war justified by religious differences.