diff options
Diffstat (limited to 'man1/git-rebase.1')
| -rw-r--r-- | man1/git-rebase.1 | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 682237ed3..1d02c19c5 100644 --- a/man1/git-rebase.1 +++ b/man1/git-rebase.1 @@ -2,12 +2,12 @@ .\" Title: git-rebase .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-01-12 +.\" Date: 2024-01-16 .\" Manual: Git Manual -.\" Source: Git 2.43.0.334.gd4dbce1db5 +.\" Source: Git 2.43.0.367.g186b115d30 .\" Language: English .\" -.TH "GIT\-REBASE" "1" "2024\-01\-12" "Git 2\&.43\&.0\&.334\&.gd4dbce" "Git Manual" +.TH "GIT\-REBASE" "1" "2024\-01\-16" "Git 2\&.43\&.0\&.367\&.g186b11" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -861,15 +861,23 @@ commands that failed\&. This only makes sense in interactive mode (or when an \fB\-\-exec\fR option was provided)\&. .sp -Even though this option applies once a rebase is started, it\(cqs set for the whole rebase at the start based on either the +This option applies once a rebase is started\&. It is preserved for the whole rebase based on, in order, the command line option provided to the initial +\fBgit rebase\fR, the \fBrebase\&.rescheduleFailedExec\fR configuration (see \fBgit-config\fR(1) -or "CONFIGURATION" below) or whether this option is provided\&. Otherwise an explicit +or "CONFIGURATION" below), or it defaults to false\&. +.sp +Recording this option for the whole rebase is a convenience feature\&. Otherwise an explicit \fB\-\-no\-reschedule\-failed\-exec\fR -at the start would be overridden by the presence of +at the start would be overridden by the presence of a \fBrebase\&.rescheduleFailedExec=true\fR -configuration\&. +configuration when +\fBgit rebase \-\-continue\fR +is invoked\&. Currently, you cannot pass +\fB\-\-[no\-]reschedule\-failed\-exec\fR +to +\fBgit rebase \-\-continue\fR\&. .RE .PP \-\-update\-refs, \-\-no\-update\-refs |