Pierre Habouzit <madcoder@xxxxxxxxxx> writes:
> $ git status
> # in the middle of a git rebase -i of master (detached head)
> ...
> # qkv/A/
> no changes added to commit (use "git add" and/or "git commit -a")
>
> If we have an ongoing operation then:
> - if we are on a branch it displays:
> # On branch $branch ($what_is_ongoing)
> # ($ongoing_hint)
> - if we are on a detached head it displays:
> # $what_is_ongoing (detached head)
> # ($ongoing_hint)
I'll reindent the above to align these example output the earlier output sample
when I apply them.
> + const char * const rebase_advice =
> + _("use \"git rebase --abort\" to abort current rebase or proceed");
> + const char * const am_advice =
> + _("use \"git am --abort\" to abort current mailbox apply or proceed");
If the reader does not even know that the "--abort" option is used to
abort, " or proceed" needs to be followed by "by doing $this", if it wants
to have any practical value. I would suggest dropping it.
> + const char * const merge_advice =
> + _("use \"git reset --hard\" to abort, or resolve conflicts and commit");
This codepath being in wt-status.c, I wonder if any of these advices could
trigger to appear in the log message editor when the user tries to run
"git commit". If so, I suspect any of the above is too late to help the
user, no?
Also, should we make these conditional upon advice.status or something?
--
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