We did half and half. I used the history/geography section of What Your Kindergartner Needs to Know as an outline.
We started with the Me on the Map book above. Then we learned about each of the continents (read books from/about some of them, learned about the countries, wildlife, food, culture, art and music in each).
Then we did a brief overview of American history.