Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> writes: > dea4562 (rerere forget path: forget recorded resolution, 2009-12-25) > introduced the forget subcommand for rerere. > ... > diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt > index acc220a..a7370d3 100644 > --- a/Documentation/git-rerere.txt > +++ b/Documentation/git-rerere.txt > @@ -40,6 +40,10 @@ This resets the metadata used by rerere if a merge resolution is to be > aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' > will automatically invoke this command. > > +'forget' <pathspec>:: > + > +This resets the conflict resolutions which rerere has recorded for <pathspec>. > + This description is not _incorrect_ per-se, but it does not convey one important aspect of the subcommand; unlike "clear" and "gc", "forget" only works in the context of the _current_ conflict resolution, just like "diff" and "status". Perhaps s/for <pathspec>/for the current conflict in <pathspec>/ would be a sufficient improvement? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html