From f07871d302c32777de25b3fde3c621be3b2e32c3 Mon Sep 17 00:00:00 2001 From: Charvi Mendiratta Date: Wed, 10 Feb 2021 17:06:43 +0530 Subject: [PATCH] rebase -i: clarify and fix 'fixup -c' rebase-todo help 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. Mentored-by: Christian Couder Mentored-by: Phillip Wood Helped-by: Eric Sunshine Signed-off-by: Charvi Mendiratta Signed-off-by: Junio C Hamano --- rebase-interactive.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rebase-interactive.c b/rebase-interactive.c index c3bd02adee..b6cbd16a17 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -44,9 +44,10 @@ void append_todo_help(int command_count, "r, reword = use commit, but edit the commit message\n" "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" +"f, fixup [-C | -c] = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\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 +56,7 @@ void append_todo_help(int command_count, "m, merge [-C | -c ]