Merge branch 'maint-1.6.1' into maint-1.6.2
authorJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:09:50 +0000 (17:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:09:50 +0000 (17:09 -0700)
commit9b7dc7183528d42c46786a0be1acc58d4cd1f47a
treedf825302756fe359cbc1e5119b7573cbdb1ac5d8
parent34ab57df974ad74cc93550bfac2f90d203837a17
parentdfe50511c7e5ec2bc771c9a5f4c3318332a7744e
Merge branch 'maint-1.6.1' into maint-1.6.2

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