Merge branch 'maint-1.6.4' into maint
commit6ff9ae9f97101c30897332f608f35ad232b1faf2
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Oct 2009 08:01:04 +0000 (13 01:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Oct 2009 08:01:04 +0000 (13 01:01 -0700)
treee301a5d90f35a9bfe4ffc9e7dbf4e9550941792d
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0
parent0a0c342568458a15528778db1480dbbaa9a0b4d9
Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
  git-stash documentation: mention default options for 'list'
Documentation/git-stash.txt