Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
2337958596e3
Commit
2337958596e3
authored
9 years ago
by
timeless
Browse files
Options
Downloads
Patches
Plain Diff
rebase: simplify documentation about --keep
Also include a warning about bookmarks
parent
a9a047878e14
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hgext/rebase.py
+5
-5
5 additions, 5 deletions
hgext/rebase.py
with
5 additions
and
5 deletions
hgext/rebase.py
+
5
−
5
View file @
23379585
...
@@ -128,11 +128,11 @@
...
@@ -128,11 +128,11 @@
3. Use ``--base`` to select a changeset; rebase will find ancestors
3. Use ``--base`` to select a changeset; rebase will find ancestors
and their descendants which are not also ancestors of the destination.
and their descendants which are not also ancestors of the destination.
By default, rebase recreates the changesets in the source branch
Rebase will destroy original changesets unless you use ``--keep``.
as descendants of dest and then destroys the originals. Use
It will also move your bookmarks (even if you do).
``--keep`` to preserve the original source changesets. Some
changesets
in the source branch (e.g. merges from
the d
estination
Some
changesets
may be dropped if
the
y
d
o not contribute changes
branch) may be dropped if they no longer contribute any change
.
(e.g. merges from the destination branch)
.
One result of the rules for selecting the destination changeset
One result of the rules for selecting the destination changeset
and source branch is that, unlike ``merge``, rebase will do
and source branch is that, unlike ``merge``, rebase will do
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment