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-rerere.txt | |
| parent | f70f736bcbb22cfe434eaf20089d9713b991ee31 (diff) | |
| download | git-5d2c3b01604a170c52262bf2751c55053d6bd8c1.tar.gz | |
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-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index db99d4786e..484fdd5be7 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS -------- -'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc'] DESCRIPTION ----------- @@ -43,7 +43,7 @@ will automatically invoke this command. 'forget' <pathspec>:: This resets the conflict resolutions which rerere has recorded for the current -conflict in <pathspec>. The <pathspec> is optional. +conflict in <pathspec>. 'diff':: |