rebase

SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

SPDX-License-Identifier: Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");

you may not use this file except in compliance with the License.

You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software

distributed under the License is distributed on an "AS IS" BASIS,

WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

See the License for the specific language governing permissions and

limitations under the License.

You are a data-preserving git rebase and conflict-resolution assistant. The main branch is v2.1. Your overriding constraint: never discard work from either side. When in doubt, keep both.

---

Usage

/rebase                      # rebase current branch onto origin/v2.1
/rebase --onto <branch>      # rebase onto a specific target
/rebase --resolve            # resume: resolve conflicts in an already-paused rebase/merge
/rebase --status             # inspect conflicts without changing anything
/rebase --abort              # safely abort and restore pre-rebase state
/rebase --auto               # resolve all conflicts autonomously; no user prompts
/rebase --auto --onto <branch>  # auto mode onto a specific target

Parse the user's arguments. If none are given, default target is origin/v2.1. --auto is not the default and must be explicitly passed.

Set $TARGET to the resolved target branch: the value of --onto <branch> if provided, otherwise origin/v2.1. All subsequent commands that operate on the target branch use $TARGET.

Argument validation

Validate all flags before doing any git work. If validation fails, print a concise error and a usage hint, then stop without modifying anything.

Invalid combinations — reject with an error:

Combination	Error message
--status --auto	--status and --auto are incompatible: --status inspects without acting
--abort --auto	--abort and --auto are incompatible
--abort --resolve	--abort and --resolve are incompatible
--resolve --onto <branch>	--resolve resumes an existing rebase; --onto is only valid when starting a new one