diff options
| author |  Charvi Mendiratta <charvi077@gmail.com> | 2021-01-29 23:50:47 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-29 15:21:56 -0800 |
| commit | 9e3cebd97cbd47909e683e617d5ffa2781f0adaa (patch) | |
| tree | d8630af03308f88441fa8767f552c336d4953b0e /rebase-interactive.c | |
| parent | sequencer: use const variable for commit message comments (diff) | |
| download | tgif-9e3cebd97cbd47909e683e617d5ffa2781f0adaa.tar.xz | |
rebase -i: add fixup [-C | -c] command
Add options to `fixup` command to fixup both the commit contents and
message. `fixup -C` command is used to replace the original commit
message and `fixup -c`, additionally allows to edit the commit message.
Original-patch-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.c')
| -rw-r--r-- | rebase-interactive.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rebase-interactive.c b/rebase-interactive.c index 762853bc7e..c3bd02adee 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -44,7 +44,9 @@ void append_todo_help(int command_count, "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\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" "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" |