diff options
| -rw-r--r-- | gbp/scripts/pq.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index 2ad7b25..a96b742 100644 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -344,8 +344,12 @@ def drop_pq(repo, branch): def rebase_pq(repo, branch): - switch_to_pq_branch(repo, branch) - GitCommand("rebase")([branch]) + if is_pq_branch(branch): + base = pq_branch_base(branch) + else: + switch_to_pq_branch(repo, branch) + base = branch + GitCommand("rebase")([base]) def main(argv): |