A command-line tool to simplify Git rebasing tasks.
This tool provides a set of commands to help you perform, simulate, visualize, and resolve conflicts during a Git rebase.
You can install the git-rebase-helper package using pip:
pip install git-rebase-helperAlternatively, to install it in editable mode (for development or testing):
git clone https://github.com/your-username/git-rebase-helper.git
cd git-rebase-helper
pip install -e .Make sure you have the following dependencies installed:
- git
- click
- gitpython
- graphviz
Run the CLI tool:
git-rebase-helper --help| Command | Description |
|---|---|
rebase |
Perform a Git rebase between two branches. |
dry-run |
Simulate the rebase process without making changes. |
visualize |
Visualize the commit history of a branch. |
resolve |
Automatically resolve common rebase conflicts. |
Replace
<base-branch>and<feature-branch>with your actual branch names.
git-rebase-helper rebase <base-branch> <feature-branch>
git-rebase-helper rebase main rebasecheckgit-rebase-helper dry-run <base-branch> <feature-branch>
git-rebase-helper dry-run main rebasecheckgit-rebase-helper visualize <branch-name>
git-rebase-helper visualize rebasecheckgit-rebase-helper resolve