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 /t/lib-rebase.sh | |
| parent | b8c0b2100bbcbbfe324962b0f15c92207d945895 (diff) | |
| download | git-71f82465b1c9546a09c442c3c9aa22ecbb76f820.tar.gz | |
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 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 25a77ee5cb..584604ee63 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -49,7 +49,7 @@ set_fake_editor () { case $line in squash|fixup|edit|reword|drop) action="$line";; - exec*) + exec*|break) echo "$line" | sed 's/_/ /g' >> "$1";; "#") echo '# comment' >> "$1";; |