Skip to content

andoriyaprashant/git_rebase_helper

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

6 Commits
 
 
 
 
 
 
 
 
 
 

Repository files navigation

git-rebase-helper

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.


Installation

You can install the git-rebase-helper package using pip:

pip install git-rebase-helper

Alternatively, 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

Usage

Run the CLI tool:

git-rebase-helper --help

Available Commands

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.

Example Usage

Replace <base-branch> and <feature-branch> with your actual branch names.

Rebase a feature branch onto a base branch

git-rebase-helper rebase <base-branch> <feature-branch>
git-rebase-helper rebase main rebasecheck

Dry run to preview a rebase

git-rebase-helper dry-run <base-branch> <feature-branch>
git-rebase-helper dry-run main rebasecheck

Visualize commit history of a branch

git-rebase-helper visualize <branch-name>
git-rebase-helper visualize rebasecheck

Attempt to auto-resolve merge conflicts

git-rebase-helper resolve

About

A command line tool to simplify Git rebasing tasks.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages