Matthieu Moy <matthieu....@imag.fr> writes:
> +static void show_revert_in_progress(struct wt_status *s,
> + struct wt_status_state *state,
> + const char *color)
> +{
> + status_printf_ln(s, color, _("You are currently reverting a commit."));
> + if (advice_status_hints) {
> + if (has_unmerged(s))
> + status_printf_ln(s, color,
> + _(" (fix conflicts and run \"git revert
> --continue\")"));
> + else
> + status_printf_ln(s, color,
> + _(" (all conflicts fixed: run \"git revert
> --continue\")"));
> + }
> + if (advice_status_hints)
> + status_printf_ln(s, color,
> + _(" (use \"git revert --abort\" to cancel the revert
> operation)"));
Why not a single conditional? i.e.
if (advice_status_hints) {
if unmerged
fix and continue
else
say continue
you can also say abort
}
Will queue on 'pu', with an straight-forward "SQUASH???" on top.
Thanks.
--
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
