From: Charvi Mendiratta Date: Sun, 07 Feb 2021 18:14:36 GMT Subject: [PATCH 3/7] rebase -i: clarify and fix 'fixup -c' rebase-todo help Message-ID: <20210207181439.1178-4-charvi077@gmail.com> In-Reply-To: <20210207181439.1178-1-charvi077@gmail.com> When `-c` says "edit the commit message" it's not clear what will be edited. The original's commit message or the replacement's message or a combination of the two. Word it such that it states more precisely what exactly will be edited and also remove the use of a period and capitalized word in the to-do help text. Mentored-by: Christian Couder Mentored-by: Phillip Wood Helped-by: Eric Sunshine Signed-off-by: Charvi Mendiratta --- rebase-interactive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rebase-interactive.c b/rebase-interactive.c index c3bd02adee..e85994beb6 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -45,8 +45,8 @@ void append_todo_help(int command_count, "e, edit = use commit, but stop for amending\n" "s, squash = use commit, but meld into previous commit\n" "f, fixup [-C | -c] = like \"squash\", but discard this\n" -" commit's log message. Use -C to replace with this\n" -" commit message or -c to edit the commit message\n" +" commit's log message; use -C to replace with this\n" +" commit message or -c to edit this commit message\n" "x, exec = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop = remove commit\n" @@ -55,7 +55,7 @@ void append_todo_help(int command_count, "m, merge [-C | -c ]