💤 forgit

Utility tool for using git interactively. Powered by junegunn/fzf.

This tool is designed to help you use git more efficiently. It's lightweight and easy to use.

📥 Installation

Make sure you have fzf installed.

# for zplug
zplug 'wfxr/forgit'

# for zgen
zgen load 'wfxr/forgit'

# for antigen
antigen bundle 'wfxr/forgit'

# for fisher
fisher install wfxr/forgit

# for omf
omf install https://github.com/wfxr/forgit

# for zinit
zinit load wfxr/forgit

# manually
# Clone the repository and source it in your shell's rc file.

You can run the following command to try forgit without installing:

# for bash / zsh
source <(curl -sSL git.io/forgit)
# for fish
source (curl -sSL git.io/forgit-fish | psub)

📝 Features

• Interactive git add selector (ga)

• Interactive git log viewer (glo)

The log graph can be disabled by option FORGIT_LOG_GRAPH_ENABLE (see discuss in issue #71).

• Interactive .gitignore generator (gi)

• Interactive git diff viewer (gd)

• Interactive git reset HEAD <file> selector (grh)

• Interactive git checkout <file> selector (gcf)

• Interactive git checkout <branch> selector (gcb)

• Interactive git checkout <commit> selector (gco)

• Interactive git stash viewer (gss)

• Interactive git clean selector (gclean)

• Interactive git cherry-pick selector (gcp)

• Interactive git rebase -i selector (grb)

• Interactive git commit --fixup && git rebase -i --autosquash selector (gfu)

⌨ Keybinds

* Available when the selection contains a commit hash. For linux users FORGIT_COPY_CMD should be set to make copy work. Example: FORGIT_COPY_CMD='xclip -selection clipboard'.

⚙ Options

aliases

shell

You can change the default aliases by defining these variables below. (To disable all aliases, Set the FORGIT_NO_ALIASES flag.)

forgit_log=glo
forgit_diff=gd
forgit_add=ga
forgit_reset_head=grh
forgit_ignore=gi
forgit_checkout_file=gcf
forgit_checkout_branch=gcb
forgit_checkout_commit=gco
forgit_clean=gclean
forgit_stash_show=gss
forgit_cherry_pick=gcp
forgit_rebase=grb
forgit_fixup=gfu

git

You can use git aliases by making git-forgit available in $PATH:

# after `forgit` was loaded
export PATH="$PATH:$FORGIT_INSTALL_DIR/bin"

Some plugin managers can help do this.

Then any forgit command will be a subcommand of git:

$ git forgit log
$ git forgit add
$ git forgit diff

Optionally you can add aliases in git:

git config --global alias.cf 'forgit checkout_file'

And use the alias in git:

git cf

pagers

Forgit will use the default configured pager from git (core.pager, pager.show, pager.diff) but can be altered with the following environment variables:

fzf options

You can add default fzf options for forgit, including keybinds, layout, etc. (No need to repeat the options already defined in FZF_DEFAULT_OPTS)

FORGIT_FZF_DEFAULT_OPTS="
--exact
--border
--cycle
--reverse
--height '80%'
"

Customizing fzf options for each command individually is also supported:

Complete loading order of fzf options is:

1. FZF_DEFAULT_OPTS (fzf global)
2. FORGIT_FZF_DEFAULT_OPTS (forgit global)
3. FORGIT_CMD_FZF_OPTS (command specific)

Examples:

• ctrl-d to drop the selected stash but do not quit fzf (gss specific).

FORGIT_STASH_FZF_OPTS='
--bind="ctrl-d:reload(git stash drop $(cut -d: -f1 <<<{}) 1>/dev/null && git stash list)"
'

• ctrl-e to view the logs in a vim buffer (glo specific).

FORGIT_LOG_FZF_OPTS='
--bind="ctrl-e:execute(echo {} |grep -Eo [a-f0-9]+ |head -1 |xargs git show |vim -)"
'

other options

📦 Optional dependencies

• delta / diff-so-fancy: For better human readable diffs.

• bat: Syntax highlighting for gitignore.

• emoji-cli: Emoji support for git log.

💡 Tips

• Most of the commands accept optional arguments (eg, glo develop, glo f738479..188a849b -- main.go, gco master).
• gd supports specifying revision(eg, gd HEAD~, gd v1.0 README.md).
• Call gi with arguments to get the wanted .gitignore contents directly(eg, gi cmake c++).
• You can use the commands as sub-commands of git, see #147 for details.

📃 License

MIT (c) Wenxuan Zhang