From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jul 2010 16:14:35 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc3~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=449aeb10d5d28083199f82c444b55a03c545e956;p=git.git

Merge branch 'maint'

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

449aeb10d5d28083199f82c444b55a03c545e956