diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-26 14:59:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-26 14:59:03 -0700 |
| commit | ce4296cf2b6f66d8717e8c3237c9b4be42fb2a1b (patch) | |
| tree | 628a8617606cf211328a8595f45947d92dfc96fb /rebase-interactive.c | |
| parent | 8c81fce4b07c7e0f76960f35b6ffdc817c09b7ad (diff) | |
| parent | 2c0aa2ce2efcac181801957d8105c7007db5faf7 (diff) | |
| download | git-ce4296cf2b6f66d8717e8c3237c9b4be42fb2a1b.tar.gz | |
Merge branch 'cm/rebase-i'
"rebase -i" is getting cleaned up and also enhanced.
* cm/rebase-i:
doc/git-rebase: add documentation for fixup [-C|-c] options
rebase -i: teach --autosquash to work with amend!
t3437: test script for fixup [-C|-c] options in interactive rebase
rebase -i: add fixup [-C | -c] command
sequencer: use const variable for commit message comments
sequencer: pass todo_item to do_pick_commit()
rebase -i: comment out squash!/fixup! subjects from squash message
sequencer: factor out code to append squash message
rebase -i: only write fixup-message when it's needed
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" |