summaryrefslogtreecommitdiff
path: root/rebase-interactive.c
diff options
context:
space:
mode:
authorDerrick Stolee <derrickstolee@github.com>2022-07-19 18:33:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-07-19 19:49:03 (GMT)
commitf57fd48d56864ed9a09d65cffe2c70b86ca7b652 (patch)
tree7a3973bc9e208a20ab06a923c665d750187896ef /rebase-interactive.c
parentaa7f2fd150e7817de6c781dc5911d6c85f334324 (diff)
downloadgit-f57fd48d56864ed9a09d65cffe2c70b86ca7b652.zip
git-f57fd48d56864ed9a09d65cffe2c70b86ca7b652.tar.gz
git-f57fd48d56864ed9a09d65cffe2c70b86ca7b652.tar.bz2
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 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. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.c')
-rw-r--r--rebase-interactive.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/rebase-interactive.c b/rebase-interactive.c
index 87649d0..2239422 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);