diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2010-01-05 06:58:30 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-04 23:37:47 -0800 |
| commit | 397d596f84209d0e9d17621ce56b5432bc98d368 (patch) | |
| tree | 8084e1f9d111d6d78fd197b0c7c56b112c289ccc /templates/Makefile | |
| parent | Fix bit assignment for CE_CONFLICTED (diff) | |
| download | tgif-397d596f84209d0e9d17621ce56b5432bc98d368.tar.xz | |
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>
Diffstat (limited to 'templates/Makefile')
0 files changed, 0 insertions, 0 deletions