summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
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.txt
parent94d00a5c4ebb12f2552118f261d8f82c05c2501d (diff)
downloadgit-htmldocs-920a695feaebbeb9ed06b0ee96c38789cc130796.tar.gz
Autogenerated HTML docs for v2.19.1-801-gd582e
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 432baabe3..3407d835b 100644
--- a/git-rebase.txt
+++ b/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".