summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-02 14:00:42 +0900
committerJunio C Hamano <gitster@pobox.com>2018-11-02 14:00:42 +0900
commit920a695feaebbeb9ed06b0ee96c38789cc130796 (patch)
treea4c733decd6cd1f4bb545e141a94d97a993e0d42 /git-rebase.html
parent94d00a5c4ebb12f2552118f261d8f82c05c2501d (diff)
downloadgit-htmldocs-920a695feaebbeb9ed06b0ee96c38789cc130796.tar.gz
Autogenerated HTML docs for v2.19.1-801-gd582e
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html
index 71b7eb861..43cec22b4 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1416,7 +1416,8 @@ idea unless you know what you are doing (see BUGS below).</p></div>
<p>
Append "exec &lt;cmd&gt;" after each line creating a commit in the
final history. &lt;cmd&gt; will be interpreted as one or more shell
- commands.
+ commands. Any command that fails will interrupt the rebase,
+ with exit code 1.
</p>
<div class="paragraph"><p>You may execute several commands by either using one instance of <code>--exec</code>
with several commands:</p></div>
@@ -2025,6 +2026,8 @@ example), so do not delete or edit the names.</p></div>
<em>git rebase</em> to stop after applying that commit, so that you can edit
the files and/or the commit message, amend the commit, and continue
rebasing.</p></div>
+<div class="paragraph"><p>To interrupt the rebase (just like an "edit" command would do, but without
+cherry-picking any commit first), use the "break" command.</p></div>
<div class="paragraph"><p>If you just want to edit the commit message for a commit, replace the
command "pick" with the command "reword".</p></div>
<div class="paragraph"><p>To drop a commit, replace the command "pick" with "drop", or just
@@ -2455,7 +2458,7 @@ reorder commits tend to produce counterintuitive results. Use
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-16 16:37:05 JST
+ 2018-11-02 14:00:19 JST
</div>
</div>
</body>