Jeff King wrote:
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -63,8 +63,14 @@ N_("The previous cherry-pick is now empty, possibly due to
> conflict resolution.\
> "If you wish to commit it anyway, use:\n"
> "\n"
> " git commit --allow-empty\n"
> +"\n");
> +static const char empty_cherry_pick_advice_skip_single[] =
> +N_("Otherwise, please use 'git reset'\n");
> +static const char empty_cherry_pick_advice_skip_multi[] =
> +N_("If you wish to skip this commit, use:\n"
> "\n"
> -"Otherwise, please use 'git reset'\n");
> +" git reset && git cherry-pick --continue\n"
> +"\n");
Hmm, wouldn't it be more consistent to either say
If you wish to commit it anyway, use
git commit --allow-empty && git cherry-pick --continue
If you wish to skip this commit, use
git reset && git cherry-pick --continue
Or
If you wish to commit it anyway, use
git commit --allow-empty
If you wish to skip this commit, use
git reset
Then "git cherry-pick --continue" will resume cherry-picking
the remaining commits.
?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
