This book list is from Keith Mathison http://www.ligonier.org/blog/church-h...

General Church History

Cross, F.L. The Oxford Dictionary of the Christian Church.
Gonzales, Justo. The Story of Christianity (2 volumes).
Houghton, S.M. Sketches from Church History.
Kuiper, B.K. The Church in History.
Latourette, Kenneth Scott. A History of Christianity.
Needham, N.R. 2000 Years of Christ’s Power (3 volumes).
Schaff, Philip. History of the Christian Church (8 volumes).
Shelley, Bruce L. Church History in Plain Language.
Tucker, Ruth A. Parade of Faith: A Biographical History of the Christian Church.

If I were to recommend only one of these titles, I would suggest Needham’s set. It only covers the period up to and including the Reformation so far, but more volumes are forthcoming. If you need something covering the entirety of church history, the two volumes by Gonzales are very helpful.

Historical Theology

Allison, Gregg R. Historical Theology: An Introduction to Christian Doctrine.
Berkhof, Louis. The History of Christian Doctrines.
Brown, Harold O. J. Heresies: Heresy and Orthodoxy in the History of the Church.
Cunningham, William. Historical Theology.
Gerrish, B.A. Thinking with the Church: Essays in Historical Theology.
Hägglund, Bengt. History of Theology.
Pelikan, Jaroslav. The Christian Tradition: A History of the Development of Doctrine (5 volumes).

If I were to recommend only one of these titles, I would suggest either Berkhof or Hägglund as an introduction to the subject.