Merge branch 'master' into next
commitd586e7ad5451875addc0f5fc29d6a2b3675ef8e2
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:56:01 +0000 (24 16:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:56:01 +0000 (24 16:56 -0700)
treed783ff7af738b3b7fcedc1cb9fbabadf614f58d9
parent097f42fb9f55c0febb2f8411a14c9c887a540473
parent5e4f61474202122f376b16181b760f390623bf4e
Merge branch 'master' into next

* master:
  Documentation: explain the meaning of "-g" in git-describe output