diff options
Diffstat (limited to 'man1/git-rebase.1')
| -rw-r--r-- | man1/git-rebase.1 | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index ed82491e5..548bd6a00 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: 03/21/2023 +.\" Date: 03/28/2023 .\" Manual: Git Manual -.\" Source: Git 2.40.0.130.g27d43aaaf5 +.\" Source: Git 2.40.0.141.g8d90352acc .\" Language: English .\" -.TH "GIT\-REBASE" "1" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GIT\-REBASE" "1" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -45,7 +45,7 @@ If \fB<branch>\fR is specified, \fBgit rebase\fR will perform an automatic \fBgi .sp If \fB<upstream>\fR is not specified, the upstream configured in \fBbranch\&.<name>\&.remote\fR and \fBbranch\&.<name>\&.merge\fR options will be used (see \fBgit-config\fR(1) for details) and the \fB\-\-fork\-point\fR option is assumed\&. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort\&. .sp -All changes made by commits in the current branch but that are not in \fB<upstream>\fR are saved to a temporary area\&. This is the same set of commits that would be shown by \fBgit log <upstream>\&.\&.HEAD\fR; or by \fBgit log \(aqfork_point\(aq\&.\&.HEAD\fR, if \fB\-\-fork\-point\fR is active (see the description on \fB\-\-fork\-point\fR below); or by \fBgit log HEAD\fR, if the \fB\-\-root\fR option is specified\&. +All changes made by commits in the current branch but that are not in \fB<upstream>\fR are saved to a temporary area\&. This is the same set of commits that would be shown by \fBgit log <upstream>\&.\&.HEAD\fR; or by \fBgit log \*(Aqfork_point\*(Aq\&.\&.HEAD\fR, if \fB\-\-fork\-point\fR is active (see the description on \fB\-\-fork\-point\fR below); or by \fBgit log HEAD\fR, if the \fB\-\-root\fR option is specified\&. .sp The current branch is reset to \fB<upstream>\fR or \fB<newbase>\fR if the \fB\-\-onto\fR option was supplied\&. This has the exact same effect as \fBgit reset \-\-hard <upstream>\fR (or \fB<newbase>\fR)\&. \fBORIG_HEAD\fR is set to point at the tip of the branch before the reset\&. .if n \{\ @@ -103,7 +103,7 @@ would be: .RS 4 .\} .nf - A\(aq\-\-B\(aq\-\-C\(aq topic + A\*(Aq\-\-B\*(Aq\-\-C\*(Aq topic / D\-\-\-E\-\-\-F\-\-\-G master .fi @@ -114,7 +114,7 @@ would be: .sp \fBNOTE:\fR The latter form is just a short\-hand of \fBgit checkout topic\fR followed by \fBgit rebase master\fR\&. When rebase exits \fBtopic\fR will remain the checked\-out branch\&. .sp -If the upstream branch already contains a change you have made (e\&.g\&., because you mailed a patch which was applied upstream), then that commit will be skipped and warnings will be issued (if the \fImerge\fR backend is used)\&. For example, running \fBgit rebase master\fR on the following history (in which \fBA\(aq\fR and \fBA\fR introduce the same set of changes, but have different committer information): +If the upstream branch already contains a change you have made (e\&.g\&., because you mailed a patch which was applied upstream), then that commit will be skipped and warnings will be issued (if the \fImerge\fR backend is used)\&. For example, running \fBgit rebase master\fR on the following history (in which \fBA\*(Aq\fR and \fBA\fR introduce the same set of changes, but have different committer information): .sp .if n \{\ .RS 4 @@ -122,7 +122,7 @@ If the upstream branch already contains a change you have made (e\&.g\&., becaus .nf A\-\-\-B\-\-\-C topic / - D\-\-\-E\-\-\-A\(aq\-\-\-F master + D\-\-\-E\-\-\-A\*(Aq\-\-\-F master .fi .if n \{\ .RE @@ -135,9 +135,9 @@ will result in: .RS 4 .\} .nf - B\(aq\-\-\-C\(aq topic + B\*(Aq\-\-\-C\*(Aq topic / - D\-\-\-E\-\-\-A\(aq\-\-\-F master + D\-\-\-E\-\-\-A\*(Aq\-\-\-F master .fi .if n \{\ .RE @@ -171,7 +171,7 @@ We want to make \fItopic\fR forked from branch \fImaster\fR; for example, becaus .nf o\-\-\-o\-\-\-o\-\-\-o\-\-\-o master | \e - | o\(aq\-\-o\(aq\-\-o\(aq topic + | o\*(Aq\-\-o\*(Aq\-\-o\*(Aq topic \e o\-\-\-o\-\-\-o\-\-\-o\-\-\-o next .fi @@ -227,7 +227,7 @@ would result in: .RS 4 .\} .nf - H\(aq\-\-I\(aq\-\-J\(aq topicB + H\*(Aq\-\-I\*(Aq\-\-J\*(Aq topicB / | E\-\-\-F\-\-\-G topicA |/ @@ -271,7 +271,7 @@ would result in the removal of commits F and G: .RS 4 .\} .nf - E\-\-\-H\(aq\-\-\-I\(aq\-\-\-J\(aq topicA + E\-\-\-H\*(Aq\-\-\-I\*(Aq\-\-\-J\*(Aq topicA .fi .if n \{\ .RE @@ -733,7 +733,7 @@ By default, or when was specified, commits which do not have \fB<upstream>\fR as direct ancestor will keep their original branch point, i\&.e\&. commits that would be excluded by -\fBgit-log\fR(1)\(aqs +\fBgit-log\fR(1)\*(Aqs \fB\-\-ancestry\-path\fR option will keep their original ancestry by default\&. If the \fBrebase\-cousins\fR @@ -1727,7 +1727,7 @@ If \fIsubsystem\fR is rebased against \fImaster\fR, the following happens: .nf o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o master \e \e - o\-\-\-o\-\-\-o\-\-\-o\-\-\-o o\(aq\-\-o\(aq\-\-o\(aq\-\-o\(aq\-\-o\(aq subsystem + o\-\-\-o\-\-\-o\-\-\-o\-\-\-o o\*(Aq\-\-o\*(Aq\-\-o\*(Aq\-\-o\*(Aq\-\-o\*(Aq subsystem \e *\-\-\-*\-\-\-* topic .fi @@ -1744,7 +1744,7 @@ If you now continue development as usual, and eventually merge \fItopic\fR to \f .nf o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o master \e \e - o\-\-\-o\-\-\-o\-\-\-o\-\-\-o o\(aq\-\-o\(aq\-\-o\(aq\-\-o\(aq\-\-o\(aq\-\-M subsystem + o\-\-\-o\-\-\-o\-\-\-o\-\-\-o o\*(Aq\-\-o\*(Aq\-\-o\*(Aq\-\-o\*(Aq\-\-o\*(Aq\-\-M subsystem \e / *\-\-\-*\-\-\-*\-\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\-*\-\-* topic .fi @@ -1800,7 +1800,7 @@ you will end up with the fixed history .nf o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o\-\-\-o master \e - o\(aq\-\-o\(aq\-\-o\(aq\-\-o\(aq\-\-o\(aq subsystem + o\*(Aq\-\-o\*(Aq\-\-o\*(Aq\-\-o\*(Aq\-\-o\*(Aq subsystem \e *\-\-\-*\-\-\-* topic .fi @@ -1891,10 +1891,10 @@ In the following example, the developer works on a topic branch that refactors t .RS 4 .\} .nf -* Merge branch \(aqreport\-a\-bug\(aq +* Merge branch \*(Aqreport\-a\-bug\*(Aq |\e | * Add the feedback button -* | Merge branch \(aqrefactor\-button\(aq +* | Merge branch \*(Aqrefactor\-button\*(Aq |\e \e | |/ | * Use the Button class for all buttons @@ -1927,8 +1927,8 @@ pick abcdef Add the feedback button label report\-a\-bug reset onto -merge \-C a1b2c3 refactor\-button # Merge \(aqrefactor\-button\(aq -merge \-C 6f5e4d report\-a\-bug # Merge \(aqreport\-a\-bug\(aq +merge \-C a1b2c3 refactor\-button # Merge \*(Aqrefactor\-button\*(Aq +merge \-C 6f5e4d report\-a\-bug # Merge \*(Aqreport\-a\-bug\*(Aq .fi .if n \{\ .RE |