Show More
@@ -1040,6 +1040,10 b' def pullrebase(orig, ui, repo, *args, **' | |||||
1040 | # dropping it |
|
1040 | # dropping it | |
1041 | if 'rev' in opts: |
|
1041 | if 'rev' in opts: | |
1042 | del opts['rev'] |
|
1042 | del opts['rev'] | |
|
1043 | # positional argument from pull conflicts with rebase's own | |||
|
1044 | # --source. | |||
|
1045 | if 'source' in opts: | |||
|
1046 | del opts['source'] | |||
1043 | rebase(ui, repo, **opts) |
|
1047 | rebase(ui, repo, **opts) | |
1044 | branch = repo[None].branch() |
|
1048 | branch = repo[None].branch() | |
1045 | dest = repo[branch].rev() |
|
1049 | dest = repo[branch].rev() |
General Comments 0
You need to be logged in to leave comments.
Login now