Merge branch 'maint'
commit449aeb10d5d28083199f82c444b55a03c545e956
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2010 16:14:35 +0000 (13 09:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2010 16:14:35 +0000 (13 09:14 -0700)
tree76f491a8574e9a199a47ba3975fd181a4ace677a
parent637ab29b86533c7ce65a615fd445d163a2c57dc9
parent1b79d1c2a8a90419238f7213870ab1dc465082fe
Merge branch 'maint'

* maint:
  git fetch documentation: describe short '-p' synonym to '--prune' option
  format-patch: document the format.to configuration setting
Documentation/config.txt