Merge branch 'maint-1.6.0' into maint
commitb61971520738dbdc7ea2e46f8183dffe7fa4f48d
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 02:48:14 +0000 (23 18:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 02:48:14 +0000 (23 18:48 -0800)
treefae72483e4e965d6a785cbea6777a47dc9bc2b04
parent950db8798d51cb183c858938263425b367b21dfd
parentb938f62a208d24f3d6bed260ceb809cd6b3924d7
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Fix Documentation for git-describe
Documentation/git-describe.txt