Re: [PATCH v2 03/11] rebase -i: clarify and fix 'fixup -c' rebase-todo help
From: Junio C Hamano <hidden>
Date: 2021-02-08 21:26:06
Charvi Mendiratta [off-list ref] writes:
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. While at it, also drop the jarring period and capitalization, neither of which is otherwise present in the message.
quoted hunk
Mentored-by: Christian Couder [off-list ref] Mentored-by: Phillip Wood [off-list ref] Helped-by: Eric Sunshine [off-list ref] Signed-off-by: Charvi Mendiratta <redacted> --- 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 <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" "f, fixup [-C | -c] <commit> = 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"
The goal is good, but I am not sure if this "the commit" -> "this commit"
is an effective enough way to fix the issue. Here is my attempt but
I do not think it is not 10x better to be worth replacing yours X-<.
use only the log message of the "fixup" commit, discarding the
message from the previous commit. While "-C" uses the message
as-is, "-c" lets the user further edit it.
quoted hunk
"x, exec <command> = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop <commit> = remove commit\n"@@ -55,7 +55,7 @@ void append_todo_help(int command_count, "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" +". specified); use -c <commit> to reword the commit message\n"
This hunk fixes the formatting by dropping the full-stop. Unlike the description of "fixup -C/-c", I find it very easy to understand. Thanks.