diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2011-03-01 14:21:05 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-02 12:26:18 -0800 |
| commit | 5d2c3b01604a170c52262bf2751c55053d6bd8c1 (patch) | |
| tree | e539b22655c9d8fdb85cb80fa88f2b5d87d22c69 /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'svn-fe' of git://repo.or.cz/git/jrn (diff) | |
| download | tgif-5d2c3b01604a170c52262bf2751c55053d6bd8c1.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions