From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Feb 2011 06:46:09 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~128
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dca3d715aa41cca8e1c02e78b1291992ad4dbb50;p=git.git

Merge branch 'maint'

* maint:
  Documentation: clarify -u<mode> option defaults
---

dca3d715aa41cca8e1c02e78b1291992ad4dbb50