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
fdf0c375cdbf
Commit
fdf0c375cdbf
authored
15 years ago
by
timeless
Browse files
Options
Downloads
Patches
Plain Diff
rebase: change rebase help to talk about changesets and branch names
parent
a9d1e7c8160e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hgext/rebase.py
+3
-3
3 additions, 3 deletions
hgext/rebase.py
tests/test-rebase-parameters.out
+12
-12
12 additions, 12 deletions
tests/test-rebase-parameters.out
with
15 additions
and
15 deletions
hgext/rebase.py
+
3
−
3
View file @
fdf0c375
...
...
@@ -460,9 +460,9 @@
(
'
s
'
,
'
source
'
,
''
,
_
(
'
rebase from a given revision
'
)),
(
'
b
'
,
'
base
'
,
''
,
_
(
'
rebase from the base of a given revision
'
)),
(
'
d
'
,
'
dest
'
,
''
,
_
(
'
rebase onto a given revision
'
)),
(
''
,
'
collapse
'
,
False
,
_
(
'
collapse the rebased
revision
s
'
)),
(
''
,
'
keep
'
,
False
,
_
(
'
keep original
revision
s
'
)),
(
''
,
'
keepbranches
'
,
False
,
_
(
'
keep original branches
'
)),
(
''
,
'
collapse
'
,
False
,
_
(
'
collapse the rebased
changeset
s
'
)),
(
''
,
'
keep
'
,
False
,
_
(
'
keep original
changeset
s
'
)),
(
''
,
'
keepbranches
'
,
False
,
_
(
'
keep original branch
nam
es
'
)),
(
'
c
'
,
'
continue
'
,
False
,
_
(
'
continue an interrupted rebase
'
)),
(
'
a
'
,
'
abort
'
,
False
,
_
(
'
abort an interrupted rebase
'
)),]
+
templateopts
,
...
...
This diff is collapsed.
Click to expand it.
tests/test-rebase-parameters.out
+
12
−
12
View file @
fdf0c375
...
...
@@ -18,9 +18,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
--collapse collapse the rebased
revision
s
--keep keep original
revision
s
--keepbranches keep original branches
--collapse collapse the rebased
changeset
s
--keep keep original
changeset
s
--keepbranches keep original branch
nam
es
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
...
...
@@ -46,9 +46,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
--collapse collapse the rebased
revision
s
--keep keep original
revision
s
--keepbranches keep original branches
--collapse collapse the rebased
changeset
s
--keep keep original
changeset
s
--keepbranches keep original branch
nam
es
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
...
...
@@ -74,9 +74,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
--collapse collapse the rebased
revision
s
--keep keep original
revision
s
--keepbranches keep original branches
--collapse collapse the rebased
changeset
s
--keep keep original
changeset
s
--keepbranches keep original branch
nam
es
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
...
...
@@ -102,9 +102,9 @@
-s --source rebase from a given revision
-b --base rebase from the base of a given revision
-d --dest rebase onto a given revision
--collapse collapse the rebased
revision
s
--keep keep original
revision
s
--keepbranches keep original branches
--collapse collapse the rebased
changeset
s
--keep keep original
changeset
s
--keepbranches keep original branch
nam
es
-c --continue continue an interrupted rebase
-a --abort abort an interrupted rebase
--style display using template map file
...
...
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