admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc: git-rebase: move --onto explanation down

Browse Source 
There's a very clear explanation with examples of using --onto which is
currently buried in the very long DESCRIPTION section. This moves it to
its own section, so that we can reference the explanation from the
`--onto` option by name.

Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Julia Evans
2025-08-23 00:43:01 +00:00
committed by Junio C Hamano
parent 1469715a9c
commit 981ce57389
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-rebase.adoc
View File

@@ -114,6 +114,9 @@ will result in:
D---E---A'---F master D---E---A'---F master
------------ ------------
TRANSPLANTING A TOPIC BRANCH WITH --ONTO
----------------------------------------
Here is how you would transplant a topic branch based on one Here is how you would transplant a topic branch based on one
branch to another, to pretend that you forked the topic branch branch to another, to pretend that you forked the topic branch
from the latter branch, using `rebase --onto`. from the latter branch, using `rebase --onto`.
@@ -240,6 +243,8 @@ As a special case, you may use "A\...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can merge base of A and B if there is exactly one merge base. You can
leave out at most one of A and B, in which case it defaults to HEAD. leave out at most one of A and B, in which case it defaults to HEAD.
See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.
--keep-base:: --keep-base::
Set the starting point at which to create the new commits to the Set the starting point at which to create the new commits to the
merge base of `<upstream>` and `<branch>`. Running merge base of `<upstream>` and `<branch>`. Running