diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 05:04:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 05:04:58 +0300 |
| commit | 789b1f70422d5c9ffb3a0ecb11284aa0ac13985e (patch) | |
| tree | 23d8b90cefd141b667962c4fcdf70968c91eeb42 /t/lib-rebase.sh | |
| parent | b78c5fe96cadf10c49b968b716a913acf43cc28e (diff) | |
| parent | 71f82465b1c9546a09c442c3c9aa22ecbb76f820 (diff) | |
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 '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 2ca9fb69d6..241f64b09b 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -49,7 +49,7 @@ set_fake_editor () { case $line in pick|squash|fixup|edit|reword|drop) action="$line";; - exec*) + exec*|break) echo "$line" | sed 's/_/ /g' >> "$1";; "#") echo '# comment' >> "$1";; |