git-extra-commands

A zsh plugin that packages some extra git helper scripts I've found. I only wrote a few of these scripts, and the ones I didn't each have whatever licensing is included in the file.

This collection doesn't actually require zsh, but packaging it as a ZSH plugin makes it more convenient for people using a ZSH framework to use this collection.

If you wrote one of these scripts and want it removed from this collection, please either make a PR and/or file an issue against the repo and I will remove it.

Table of Contents generated with DocToc

Installing
Other useful git stuff
- Articles / Blog posts / Books
- Utilities
Credits
Contributing

Installing

Pre-requisites

The version of git Apple includes in OS X is stale. brew install git if you're on OS X.

Antigen

If you're using Antigen:

Add antigen bundle unixorn/git-extra-commands to your .zshrc where you've listed your other plugins.
Close and reopen your Terminal/iTerm window to refresh context and use the plugin. Alternatively, you can run antigen bundle unixorn/git-extra-commands in a running shell to have antigen load the new plugin.

oh-my-zsh

If you're using oh-my-zsh:

In the command line, change to oh-my-zsh's custom plugin directory :

cd ~/.oh-my-zsh/custom/plugins/
Clone the repository into a new git-extra-commands directory:

git clone https://github.com/unixorn/git-extra-commands.git git-extra-commands
Edit your ~/.zshrc and add git-extra-commands – same as clone directory – to the list of plugins to enable:

plugins=( ... git-extra-commands )
Then, restart your terminal application to refresh context and use the plugin. Alternatively, you can source your current shell configuration:

source ~/.zshrc

zgen

If you're using zgen:

Add zgen load unixorn/git-extra-commands to your .zshrc along with your other zgen load commands.
rm ${ZGEN_INIT}/init.zsh && zgen save

Manual Installation

Nothing here actually requires you to use ZSH or zgen, that's just a convenient distribution method for anyone using a ZSH framework.

If you aren't using any zsh frameworks, or if you're a bash user, do the following steps:

git clone this repository
Add it to your $PATH.

Other useful git stuff

Articles / Blog posts / Books

Scott Chacon's Pro Git book is a great resource for getting more out of git.
Zach Dennis has a great blog post - it's worth reading on it's own, but here are a couple of good sites I found through it:
- gitready.com/ is another great reference which has been collecting information and tips for git since 2009.
- gitimmersion.com/
There’s a quick introduction to git on learnxinyminutes.com, and a more detailed git tutorial at http://www.learnenough.com/git-tutorial.
Kate Hudson maintains the git flight rules collection of useful git usage tips.
awesome-github - Faraz Fallahi maintains a curated list of Github & Git resources.

Utilities

blackbox - Tom Limoncelli open sourced the tool they use at Stack Exchange to use GPG to store secrets in a git repository.
branch-manager - ZSH plugin for branch management
git-amend - Bash script to amend older commits with staged changes.
git-branch-status - A git utility to make managing large number of branches either across many remotes easier. Branch status allows comparing all branches against their upstream or any arbitrary branch to show the number of commit differences.
git-diffall - Provides a directory based diff mechanism for git.
Peter Hurford's git-aliases.zsh, which you may prefer to the git plugin from oh-my-zsh.
git-fastclone - Think git clone --recursive on steroids. If you're doing repeated checkouts of a given repo on a machine (like a ci box), git-fastclone will speed things up considerably.
git-graph - creates a Graphviz graph showing the high-level structure of a repository's history
git_history_visualizer - python script to visualize the history of files in a git repository
Peter also wrote the git-it-on.zsh plugin. It adds a gitit command that will open your current directory on github, in your current branch.
gitsh - An interactive shell for git. From within gitsh you can issue any git command, even using your local aliases and configuration.
git-secrets - Prevents you from committing secrets and credentials into git repositories.
git-submodule-tools - A collection of scripts that should help make life with git submodules easier.
git-up - Fetch and rebase all locally-tracked remote branches
git-wayback-machine - A simple script to quickly navigate a project's state through it's GIT history

Credits

git-big-file - Mislav Marohnić's dotfiles
git-change-author - Michael Demmer in jut-io/git-scripts
git-changes - Michael Markert's dotfiles
git-churn - Gary Bernhardt's dotfiles
git-copy-branch-name - Zach Holman's dotfiles
git-credit - Zach Holman's dotfiles
git-cut-branch - Ryan Tomayko's dotfiles
git-delete-local-merged - https://plus.google.com/115587336092124934674/posts/dXsagsvLakJ
git-divergence - Gary Bernhardt's dotfiles
git-find-dirty - Matthew McCullough's scripts repository
git-flush - John Wiegley's git-scripts
git-forest - Jan Engelhardt
git-git - Mine.
git-grab - Ryan Tomayko's dotfiles
git-improved-merge - Mislav Marohnić's dotfiles
git-incoming - Michael Markert's dotfiles
git-incoming-commits - Ryan Tomayko's dotfiles
git-ls-object-refs - Ryan Tomayko's dotfiles
git-maxpack - John Wiegley's git-scripts
git-move-commits - Corey Oordt's git-scripts
git-nuke - Zach Holman's dotfiles
git-object-deflate - Ryan Tomayko's dotfiles
git-outgoing - Michael Markert's dotfiles
git-pie-ify - JeeBak Kim's gist
git-plotrepo - Matthew McCullogh's scripts collection
git-promote - Trevor's Improving My git Workflow blog post
git-prune-branches - Michael Demmer in jut-io/git-scripts
git-publish - Michael Markert's dotfiles
git-purge-from-history - David Underhill’s blog
git-pylint - Runs pylint on any .py files modified or added in the git status
git-rank-contributors - William Morgan [email protected]
git-rebase-authors - Mislav Marohnić's dotfiles
git-rel - Ryan Tomayko's dotfiles
git-run-command-on-revisions - Gary Bernhardt's dotfiles
git-shamend - Danielle Sucher's git-shamend blog post
git-show-overwritten - Mislav Marohnić's dotfiles
git-submodule-rm - Greg V's dotfiles
git-thanks - Mislav Marohnić's dotfiles
git-track - Zach Holman's dotfiles
git-trail - Daniel Hahler's dotfiles
git-undo-push -
git-unpushed - Zach Holman's dotfiles
git-unreleased - Mislav Marohnić's dotfiles
git-up - Ryan Tomayko's dotfiles
git-upstream-sync - One of my personal scripts
git-when-merged - Michael Haggerty git-when-merged
git-where - Mislav Marohnić's dotfiles
git-winner - Garry Dolley https://github.com/up_the_irons/git-winner
git-wtf - William Morgan
github-open - Ryan Tomayko's dotfiles

Contributing

Please include an entry in the credits section of README.md for any scripts in your PRs so authors get their work credited correctly.
Please use #!/usr/bin/env interpreter instead of a direct path to the interpreter, this makes it easier for people to use more recent versions when the ones packaged with their OS (OS X and CentOS, I'm looking at you) are stale.

d3labsinc / git-extra-commands Goto Github PK