Re: [PATCH v3 3/8] rebase-interactive: update 'merge' description
On 28/06/2022 14:25, Derrick Stolee via GitGitGadget wrote:
Show 18 quoted lines
> From: Derrick Stolee <derrickstolee@github.com>
>
> The 'merge' command description for the todo list documentation in an
> interactive rebase has multiple lines. The lines other than the first
> one start with dots ('.') while the similar multi-line documentation for
> 'fixup' does not.
>
> The 'merge' command was documented when interactive rebase was first
> ported to C in 145e05ac44b (rebase -i: rewrite append_todo_help() in C,
> 2018-08-10). These dots might have been carried over from the previous
> shell implementation.
>
> The 'fixup' command was documented more recently in 9e3cebd97cb (rebase
> -i: add fixup [-C | -c] command, 2021-01-29).
>
> Looking at the output in an editor, my personal opinion is that the dots
> are unnecessary and noisy. Remove them now before adding more commands
> with multi-line documentation.I agree, this is a nice cleanup
Thanks
Phillip
Show 22 quoted lines
> Signed-off-by: Derrick Stolee <derrickstolee@github.com>
> ---
> rebase-interactive.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/rebase-interactive.c b/rebase-interactive.c
> index 87649d0c016..22394224faa 100644
> --- a/rebase-interactive.c
> +++ b/rebase-interactive.c
> @@ -54,9 +54,9 @@ void append_todo_help(int command_count,
> "l, label <label> = label current HEAD with a name\n"
> "t, reset <label> = reset HEAD to a label\n"
> "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
> -". create a merge commit using the original merge commit's\n"
> -". message (or the oneline, if no original merge commit was\n"
> -". specified); use -c <commit> to reword the commit message\n"
> +" create a merge commit using the original merge commit's\n"
> +" message (or the oneline, if no original merge commit was\n"
> +" specified); use -c <commit> to reword the commit message\n"
> "\n"
> "These lines can be re-ordered; they are executed from top to bottom.\n");
> unsigned edit_todo = !(shortrevisions && shortonto);