The Wehrmacht was the military of Nazi Germany from 1935 to 1945. It was made up of the Heer (army), the Luftwaffe (air force), and the Kriegsmarine (navy). The Waffen SS also be considered part of the Wehrmacht as it was under the command of the army even though the SS was separate from the Wehrmacht. It was one of the major militaries during World War II and enjoyed initial success although it was eventually defeated by the combined might of the allies.
History
The original article can be found at Wehrmacht and the edit history here.