Merge branch 'km/maint-doc-git-reset'
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:00:33 +0000 (08:00 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:00:33 +0000 (08:00 -0500)
* km/maint-doc-git-reset:
  doc: git-reset: make "<mode>" optional


Trivial merge