Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > On Fri, 31 Oct 2008, Alex Riesen wrote: > >> Pierre Habouzit, Fri, Oct 31, 2008 16:55:27 +0100: >> > @@ -439,16 +436,17 @@ static int revert_or_cherry_pick(int argc, const char **argv) >> > >> > int cmd_revert(int argc, const char **argv, const char *prefix) >> > { >> > +#if 0 >> > + warning("git revert is deprecated, please use git cherry-pick --revert/-R instead"); >> > +#endif >> >> "git revert" is much shorter to type than "git cherry-pick -R". How >> about renaming "cherry-pick" into something short, like "pick"? > > I thought we agreed that we should _never_ remove support for "git > revert"? I mean, we can deprecate it, but I find it pretty strong, and > unnecessary, to break existing users' expectations. Likewise. The current state of affairs is that there is no remedy if teachers find "git checkout -- path" or "git revert HEAD~24" is confusing to new people. By introducing "git unstage path" or "git cherry-pick -r HEAD~24", teachers can choose to teach what they feel less confusing, and they do not have to teach "git checkout -- path" or "git revert HEAD~24". We should stop there. -- 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