GitVivekHelper

Your personal Git assistant, designed to make your workflow faster, easier, and safer.

GitVivekHelper is a Visual Studio Code extension built to simplify Git for everyone, from beginners to professionals. It automates common, repetitive tasks and, most importantly, helps prevent common mistakes like merge conflicts before they happen.

Key Features

• Create New Branch: Quickly create a new branch and switch to it.
• One-Command Setup: Initialize a new repository and push it to GitHub with a single command.
• One-Command Push: Add, commit, and push all your changes in one simple step.
• Smart "Quick Pull": Automatically stashes your local changes, pulls remote changes, and then unstashes your changes, saving you from conflicts.
• Automatic Conflict Protection: Activates a pre-push hook that checks for remote changes and stops you from pushing if your local branch is behind. This is the ultimate safety net!
• Conflict Resolution Tools: Provides commands to stash, unstash, continue rebase, and abort rebase to easily manage complex Git situations.
• History at a Glance: Instantly view your last commit or the entire project history graph in your terminal.

Getting Started

1. Install the extension from the VS Code Marketplace.
2. Open your project folder in VS Code.
3. Open the Command Palette (Ctrl+Shift+P or Cmd+Shift+P).
4. Type GitVivekHelper to see all available commands.

🛡️ Recommended First Step: Activate Conflict Protection

For any project, run this command once:

GitVivekHelper: Setup Conflict Protection (Pre-Push Hook)

This will activate the automatic conflict checker for your project.

All Commands Explained

Here is a detailed list of all commands provided by GitVivekHelper:

Core Workflow

1. GitVivekHelper: Create New Branch (and switch)

   • What it does: Asks you for a branch name, then runs git checkout -b <name> to create and switch to that new branch.

2. GitVivekHelper: Setup & Initial Push to Remote

   • What it does: Automates the 5-step process of initializing a new project and connecting it to GitHub.

3. GitVivekHelper: Quick Add, Commit & Push

   • What it does: Your daily-use command. Pushes all your current changes.
   • How it works: First, it checks if you are behind the remote. If you are, it aborts the push and tells you to run "Quick Pull" first.

4. GitVivekHelper: Quick Pull (Smart - Stashes changes)

   • What it does: This is the magic command. It safely pulls remote changes without forcing you to delete your local work.
   • How it works:
     1. Stashes (saves) your local changes.
     2. Pulls the remote changes (using rebase).
     3. Unstashes (applies) your changes back on top.

Team & Syncing

5. GitVivekHelper: Sync with Main (Rebase)

   • What it does: Updates your current feature branch with the latest code from the main branch.

6. GitVivekHelper: Sync with Peer Branch (Rebase)

   • What it does: Allows you to pull changes from another developer's branch (e.g., vivek-feature) into your own.

History & Protection

7. GitVivekHelper: Show Last Commit Details

   • What it does: Quickly shows you the last commit's hash, message, author, and time.

8. GitVivekHelper: Show Project History (Graph)

   • What it does: Opens a new terminal panel and displays a beautiful, full graph of your entire Git history.

9. GitVivekHelper: Setup Conflict Protection (Pre-Push Hook)

   • What it does: Activates automatic protection against merge conflicts.
   • How it works: It creates a pre-push script in .git/hooks that blocks any push if you are behind the remote, saving you from conflicts.

Conflict & Stash Tools (Advanced)

10. GitVivekHelper: Stash Current Changes

    • What it does: Manually saves your uncommitted changes to the stash, leaving your working directory clean.

11. GitVivekHelper: Unstash Last Changes (Pop)

    • What it does: Applies your most recent stash back to your working directory.

12. GitVivekHelper: Continue Rebase (After conflict fix)

    • What it does: If a pull/rebase fails due to a conflict, use this command after you have manually fixed the files. It tells Git to continue the process.

13. GitVivekHelper: Abort Current Rebase

    • What it does: If you are in a conflict state and get confused, this command cancels the entire pull/rebase and returns your branch to how it was.

Companion CLI Tool (gvh)

Love these commands? Want to use them outside of VS Code? You can!

We also offer a global CLI (Command Line Interface) tool that provides the same features.

# Install the CLI tool from npm
npm install -g gitvivekhelper

# Now you can use it in any terminal
gvh push "My new feature"
gvh pull
gvh sync-main