Merge branch 'maint-1.6.2' into maint
commit50a991ec46d57ffc4b7fbd0e8a13182dab3cd5de
authorJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:10:08 +0000 (13 17:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:10:08 +0000 (13 17:10 -0700)
treec31c323feb0503bbcf5ad241192a3bbfc879b6e9
parent94af7c31a52ba1a26bd663c794e33284acf41a49
parent9b7dc7183528d42c46786a0be1acc58d4cd1f47a
Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
  git-rerere.txt: grammatical fixups and cleanups