I'm also curious about the way military strategy developed alongside technological improvements. If there isn't a book that covers A-Z my second choice for a timeframe would be from the 1700s-WW1. Thank you!
You might want to try "A history of warfare" by John Keegan. John Keegan is a noted military historian and his writings on military matters are always top notch. He goes from the Bronze Age to past world war 2, he also spends a decent amount of time talking about military theory, which is very interesting. Although the book was published in 1993 so it might be a bit dated.
http://en.m.wikipedia.org/wiki/A_History_of_Warfare
There is also a book released by the smithsonian which deals with warfare through out the ages, but it is really light on text and heavy on pictures.
Keegan's A History of Warfare, as has been suggested by others, is certainly one of the best books that fit what you're looking for. I'll give a couple of other suggestions that I think will be interesting reads.
Homing in on your 'second choice for a timeframe', I'd recommend Jeremy Black's War and the World: Military Power and the Fate of Continents 1450-2000. It covers the technological as well as the political aspects of war, and the effects changes in those aspects have had on tactics and strategy. The book is still a bit Western-centric but not as blatant as many other books on military history. All in all, the book covers a lot of ground and I found it a very interesting read.
The inside cover text for the War and the World says "He [Black] takes issue with established interpretations, not least those which emphasise technology, and directly challenges the view that European military and naval forces were dominant throughout the period." This refers to the ideas in Geoffrey Parker's The Military Revolution: Military Innovation and the Rise of the West and the debate which that book sparked. While Black's War and the World is a perfectly fine read on its own, reading it after Parker's The Military Revolution would lead to a deeper understanding of the subject matter.
If you'll indulge me for a moment, I'd like to make a bit of an unconventional suggestion. This book honestly does not meet academic standards for history, but I like to think of it as a bit of history in itself. Written some 20 years after the Second World War by Lord Montgomery - that is Field Marshal Bernard Law Montgomery, commander of British forces in Europe during WWII - this book covers war from the earliest time up to and including WWII. It is fully Western-centric (one of the twenty chapters covers Asian warfare) and contains many descriptions of battles while being a bit light on the analytical side.
What makes this book so interesting to me is that Montgomery makes personal remarks throughout the book. He regularly relates military history to his training, experience, family history; sometimes he just gives his opinion, which no proper historian would do. For example on the Crusades he says: "I have found it difficult to raise any great enthusiasm over the operations of the crusaders." (p.89) Not a very scholarly remark, but I love it. On that same page he mentions his ancestor, who apparently was a cousin of William the Conqueror, and his "old enemy Rommel". (Don't worry, not every page has this many examples.) Things of course get very interesting as Montgomery describes the events in Western Europe in 1944, where he played a very large role. Operation Market Garden, a veritable military disaster whichever way you look at it, is described as "the Germans (...) delivered a repulse to airborne forces at Arnhem". Now we know a 70% casualty rate is "a repulse". Whose fault was this "repulse"? Why, the Americans of course, because they didn't listen to Monty.
To be fair, most of the history in this book is pretty straightforward, factual and uncontroversial. I just haven't focussed on those parts because to be honest, if this book wasn't written by Montgomery, if it didn't have his personal comments interspersed, it wouldn't be good enough. There definitely are better history books out there. If you want the proper scholarly history read Keegan or Black. If you like personal touches, Montgomery is quite interesting.
[minor edit for spelling]
I personally like "Battle" by R.G.Grant. It covers warfare from 3000 B.C. all the way to the present day. It talks about several important battles in almost every notable war, and gives detailed accounts of weapons and tactics used throughout history. It's a very good read.
http://www.gutenberg.org/ebooks/41426
Annals of a Fortress
It's written as a series of stories involving the repeated siege of a hill fortress in France from ancient times through the end of the 19th century. There's an interesting bit at the end where the author tries to figure out the best way to fortify France against Germany, and decides that a huge wall wouldn't be practical, and that mobility would be paramount.
If you are okay with starting in the Middle Ages and focusing on Europe, try War in European History by Michael Howard.
If you have several thousand pounds, then the Osprey series (check the side bar for specific periods) will cover everything in more detail than you'll ever want.
Not for general warfare, but Max Boot covers guerilla warfare from prehistory to the present in "Invisible Armies". Also if you look at his bibliography he covers many of the common works cited in military history and strategy.
In addition to Keegan, as some people have mentioned, you might want to try Archer Jones' Art of War in the Western World. It neglects a lot of things, including Eastern Europe, Africa, and Asia, but it has a pretty cute theory of the historical shift between strength and mobility.
As some have mentioned, Sir John Keegan's "A History of Warfare" would cover the OP's desired subject matter, and as companion sources I would suggest his "Soldiers (A History of Men in Battle)" book, which is well illustrated and based upon a 1985 BBC television series; clips of which can be found on YouTube here