Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > The description does not make it obvious to me how these two (--merge > and --keep) differ. I think the intent of the options are: > > --keep: > start working on a different commit, carrying over local changes > (like "git checkout") > --merge: > return to <commit>, cancelling a merge-like operation that > creates some unmerged and some clean index entries > > Maybe something along these lines could be ok starting point? > > OPT_SET_INT(0, "keep", &reset_type, > "move to <commit>, carrying over local changes in working tree", > KEEP), > OPT_SET_INT(0, "merge", &reset_type, > "return to <commit>, cancelling failed merge or cherry-pick", > MERGE), I cannot think of anything better, but I can still show my concern that "move to" and "return to" might not convey exactly what we are trying to express. But I agree that your phrasing definitely is a good starting point. -- 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