Both. de Gaulle wrote a book in the early 30's about mobile warfare. The germans read it and used it for blitzkrieg. His ideas were not popular with the higher ups, but during the battle of France he was given one French Armored Division, and he was able to attack and drive back the Germans.
Being also a politician, he was asked to join the new French Government. After the surrender, de Gaulle flew to Britain with one small suitcase and the honor of France. From there he organized the Free French. He managed to tick off just about everyone at one time or another as he lobbied for France. de Gualle was a conservative, while most of the French resistance and Free French were socialists.
After the war, the French created the fourth republic, with all the problems of the third. de Gualle went into retirement, but also started organizing his own party, the Gaulists. In the 50's the problems with Algerian independence caused a constitutional crisis. de Gaul led the effort for a new constitution with a strong presidency, and served as the first president of the 5th republic.
So de Gaulle is a father of his country, like George Washington. Except nobody wanted to run up to George and kick him in the shins, but most everyone wanted to do that to de Gaulle at one time or other.