diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:58 (GMT) |
| commit | 789b1f70422d5c9ffb3a0ecb11284aa0ac13985e (patch) | |
| tree | 23d8b90cefd141b667962c4fcdf70968c91eeb42 /Documentation/git-rebase.txt | |
| parent | b78c5fe96cadf10c49b968b716a913acf43cc28e (diff) | |
| parent | 71f82465b1c9546a09c442c3c9aa22ecbb76f820 (diff) | |
| download | git-789b1f70422d5c9ffb3a0ecb11284aa0ac13985e.zip git-789b1f70422d5c9ffb3a0ecb11284aa0ac13985e.tar.gz git-789b1f70422d5c9ffb3a0ecb11284aa0ac13985e.tar.bz2 | |
Merge branch 'js/rebase-i-break'
"git rebase -i" learned a new insn, 'break', that the user can
insert in the to-do list. Upon hitting it, the command returns
control back to the user.
* js/rebase-i-break:
rebase -i: introduce the 'break' command
rebase -i: clarify what happens on a failed `exec`
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 432baab..3407d83 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -441,7 +441,8 @@ See also INCOMPATIBLE OPTIONS below. --exec <cmd>:: Append "exec <cmd>" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell - commands. + commands. Any command that fails will interrupt the rebase, + with exit code 1. + You may execute several commands by either using one instance of `--exec` with several commands: @@ -641,6 +642,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". |