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

* js/reset-usage:
reset: fix usage

1  2 
builtin/reset.c
diff --cc builtin/reset.c
Simple merge