From: Rodney Bates <rodney.bates@gmx.com>
To: git@vger.kernel.org
Subject: Contradictory git help rebase
Date: Mon, 21 Jul 2025 14:57:37 -0500 [thread overview]
Message-ID: <aafa3de8-5774-4a18-86dc-37493228b044@gmx.com> (raw)
The text and an example in the output of git help rebase seem to contradict about
which branch gets changed by git rebase master topic. Here is an edited version
of the output, with irrelevant stuff omitted and relationships made specific.
NAME
git-rebase - Reapply commits on top of another base tip
SYNOPSIS
git rebase
[<upstream> [<branch>]]
In the example command below, <upstream> is master and <branch> is topic.
If <branch> is specified, git rebase will perform an automatic git switch <branch> before doing anything else.
Otherwise it remains on the current branch.
Current branch is now <branch>=topic.
If <upstream> is not specified ... (irrelevant)
All changes made by commits in the current branch (=topic) but that are not in <=upstream> (master) are saved to a temporary area.
The current branch is reset to <upstream>,
Current branch is now <upstream>=master.
The commits that were previously saved into the temporary area are then reapplied to the current branch (master), one by
one, in order.
I.e., master is changed, topic is not.
Assume the following history exists and the current branch is "topic":
A---B---C topic
/
D---E---F---G master
From this point, the result of either of the following commands:
git rebase master topic
would be:
A'--B'--C' topic
/
D---E---F---G master
But this diagram shows topic changed, master not.
next reply other threads:[~2025-07-21 19:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-21 19:57 Rodney Bates [this message]
2025-07-21 20:29 ` Contradictory git help rebase Nico Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aafa3de8-5774-4a18-86dc-37493228b044@gmx.com \
--to=rodney.bates@gmx.com \
--cc=git@vger.kernel.org \
--cc=rodney.m.bates@acm.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox