diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-12 06:14:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-12 23:03:04 +0900 |
| commit | 71f82465b1c9546a09c442c3c9aa22ecbb76f820 (patch) | |
| tree | 8ae30aaaf7716dc88fa8541ce53950221894410c /Documentation/git-rebase.txt | |
| parent | b8c0b2100bbcbbfe324962b0f15c92207d945895 (diff) | |
| download | git-71f82465b1c9546a09c442c3c9aa22ecbb76f820.tar.gz git-71f82465b1c9546a09c442c3c9aa22ecbb76f820.tar.xz | |
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 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index d9771bd25..6b71694b0 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -561,6 +561,9 @@ By replacing the command "pick" with the command "edit", you can tell the files and/or the commit message, amend the commit, and continue rebasing. +To interrupt the rebase (just like an "edit" command would do, but without +cherry-picking any commit first), use the "break" command. + If you just want to edit the commit message for a commit, replace the command "pick" with the command "reword". |