diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-12 13:14:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-12 14:03:04 (GMT) |
| commit | 71f82465b1c9546a09c442c3c9aa22ecbb76f820 (patch) | |
| tree | 8ae30aaaf7716dc88fa8541ce53950221894410c /rebase-interactive.c | |
| parent | b8c0b2100bbcbbfe324962b0f15c92207d945895 (diff) | |
| download | git-71f82465b1c9546a09c442c3c9aa22ecbb76f820.zip git-71f82465b1c9546a09c442c3c9aa22ecbb76f820.tar.gz git-71f82465b1c9546a09c442c3c9aa22ecbb76f820.tar.bz2 | |
rebase -i: introduce the 'break' command
The 'edit' command can be used to cherry-pick a commit and then
immediately drop out of the interactive rebase, with exit code 0, to let
the user amend the commit, or test it, or look around.
Sometimes this functionality would come in handy *without*
cherry-picking a commit, e.g. to interrupt the interactive rebase even
before cherry-picking a commit, or immediately after an 'exec' or a
'merge'.
This commit introduces that functionality, as the spanking new 'break'
command.
Suggested-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.c')
| -rw-r--r-- | rebase-interactive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rebase-interactive.c b/rebase-interactive.c index 0f4119c..78f3263 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -14,6 +14,7 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty, "s, squash <commit> = use commit, but meld into previous commit\n" "f, fixup <commit> = like \"squash\", but discard this commit's log 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" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" |