Code

rerere forget: deprecate invocation without pathspec
authorJohannes Sixt <j6t@kdbg.org>
Tue, 1 Mar 2011 13:21:05 +0000 (14:21 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Mar 2011 20:26:18 +0000 (12:26 -0800)
commit5d2c3b01604a170c52262bf2751c55053d6bd8c1
treee539b22655c9d8fdb85cb80fa88f2b5d87d22c69
parentf70f736bcbb22cfe434eaf20089d9713b991ee31
rerere forget: deprecate invocation without pathspec

rerere forget is a destructive command. When invoked without a path, it
operates on the current directory, potentially deleting many recorded
conflict resolutions.

To make the command safer, a path must be specified as of git 1.8.0. Until
then, give users time to write 'git rerere forget .' if they really mean
the entire current directory.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rerere.txt
builtin/rerere.c