Skip to content

Commit f57fd48

Browse files
derrickstoleegitster
authored andcommitted
rebase-interactive: update 'merge' description
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. This description only appears in the comment text of the todo file during an interactive rebase. The 'merge' command was documented when interactive rebase was first ported to C in 145e05a (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 9e3cebd (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. Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent aa7f2fd commit f57fd48

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

rebase-interactive.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ void append_todo_help(int command_count,
5454
"l, label <label> = label current HEAD with a name\n"
5555
"t, reset <label> = reset HEAD to a label\n"
5656
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
57-
". create a merge commit using the original merge commit's\n"
58-
". message (or the oneline, if no original merge commit was\n"
59-
". specified); use -c <commit> to reword the commit message\n"
57+
" create a merge commit using the original merge commit's\n"
58+
" message (or the oneline, if no original merge commit was\n"
59+
" specified); use -c <commit> to reword the commit message\n"
6060
"\n"
6161
"These lines can be re-ordered; they are executed from top to bottom.\n");
6262
unsigned edit_todo = !(shortrevisions && shortonto);

0 commit comments

Comments
 (0)