GitFu

This repository originally started off as my desire to add more custom functionality to your normal git commands.

An alternative method is certainly to use git alias. This entire repository could have been merely designed with standalone scripts, with some other form of automation connecting these standalone scripts to the user's global config file. i.e.

$ git config -e --global
[alias]
   check = "!/path/to/gitfu/check.py"

The benefits with this approach is two-fold:

Easy installation (pip install -u, and everything is configured)
Adding customization on top of existing git commands

I admit, it's very specific to my workflow; however, if you're interested in using any of the scripts piecemeal, all unique commands are written so that they can be imported in your own git alias if you so desire.

Quickstart

$ git clone https://github.com/domanchi/gitfu
$ cd gitfu && pip install -e .

Find out where it installed your binary with:

$ pip uninstall gitfu
Found existing installation: gitfu 0.0.1
Uninstalling gitfu-0.0.1:
  Would remove:
    /home/domanchi/pyenv/versions/3.7.10/bin/add-git-staged-files
    /home/domanchi/pyenv/versions/3.7.10/bin/gitfu
    /home/domanchi/pyenv/versions/3.7.10/bin/remove-git-branch
    /home/domanchi/pyenv/versions/3.7.10/bin/switch-git-branch
    /home/domanchi/pyenv/versions/3.7.10/lib/python3.7/site-packages/gitfu.egg-link
Proceed (y/n)? n

Then, in your .bash_profile, add this line:

eval "$(gitfu init --directory '/home/domanchi/pyenv/versions/3.7.10/bin')"

These additional complicated steps are needed for an editable install. Otherwise, you can just do pip install && eval "$(gitfu init)", and everything will set itself up.

Features

Custom Commands

git commit prevents WIP commits from staying in git history.
git check interactively displays changed file diffs, and prompts the user whether to stage this change.

Standalone Scripts

add-git-staged-files quickly adds all staged files again (useful for situations where linters modify the files on pre-commit)
remote-git-branch helps you remove branches, and optionally purges all merged branches.
switch-git-branch allows quick branch switching, with inexact branch name matching, and built in conflict resolution.