From: Christian Couder <chriscool@tuxfamily.org>
Date: Tue, 5 Jan 2010 05:58:30 +0000 (+0100)
Subject: Documentation: reset: add some missing tables
X-Git-Tag: v1.7.0-rc0~102^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/397d596f84209d0e9d17621ce56b5432bc98d368?hp=397d596f84209d0e9d17621ce56b5432bc98d368

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>
---