Merge branch 'km/maint-doc-git-reset' into next
commitcdb4e8fb2e21dd94991e77fc5f4c2abb80403371
authorJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:44:25 +0000 (29 04:44 -0400)
committerJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:44:25 +0000 (29 04:44 -0400)
tree9b5d6011a18d98b74912d16446c986b821a61550
parent434fbd0ab6d4d725d2d30f37af2408115af4436f
parentd505865be5c7d72abb74318940e8c4c52aa0db5f
Merge branch 'km/maint-doc-git-reset' into next

* km/maint-doc-git-reset:
  doc: git-reset: make "<mode>" optional