David Kågedal <davidk@xxxxxxxxxxxxxx> writes: > The git-am and git-rebase commands have some similarities in that both > try to apply patches and may fail in the middle. Both commands can be > rerun to continue the application. The --skip option is used in both > to skip one patch, but when a conflict has been resolved, git-rebase > uses --continue, and git-am uses --resolved for what seems to me to be > the equivalent action. > > It would probably be good, although not terribly important, if these > commands were change to be in harmony. But I'm not sure which option > I like best... Well, git-rebase did not have any options like them in the beginning, so a logical option would be to add --resolved as a synonym to the latter. - 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