Merge branch 'master' into next
commit605ded4a0220a14c048470319686b5520aec49e9
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 06:46:23 +0000 (21 22:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 06:46:23 +0000 (21 22:46 -0800)
tree642a4dfc68ef7461264aec55425d764419878cfb
parentc384c3cd5c96cbc93ed676f1cccd0d1933a160ad
parentdca3d715aa41cca8e1c02e78b1291992ad4dbb50
Merge branch 'master' into next

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