Merge branch 'js/reset-usage' into maint
commit9a82d8fd0b778664c5178b27b17a5dbbac5e9d21
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:22 +0000 (28 09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:22 +0000 (28 09:01 -0700)
treea7ec5ec3783b4039da3a5049f47488516cc22d3b
parent311811b39ff3e0f7035e09ec45f992f10beaaa56
parent641c900b2c3a8c3d385eb353b3801a5f49ddbb47
Merge branch 'js/reset-usage' into maint

Message fix-up.

* js/reset-usage:
  reset: fix usage
builtin/reset.c