Documentation: reset: add some missing tables
authorChristian Couder <chriscool@tuxfamily.org>
Tue, 5 Jan 2010 05:58:30 +0000 (06:58 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Jan 2010 07:37:47 +0000 (23:37 -0800)
commit397d596f84209d0e9d17621ce56b5432bc98d368
tree8084e1f9d111d6d78fd197b0c7c56b112c289ccc
parentbf96c931994382d99e4e4d55f7b22b6779787a9d
Documentation: reset: add some missing tables

and while at it also explain why --merge option is disallowed in some
cases.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-reset.txt