On Tue, Jun 15, 2010 at 12:37 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> +'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? Also, pathspec is optional. j. -- 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