git-extra-commands is a plugin that packages some extra git helper scripts. This collection is licensed with the Apache Version 2 license.
However, some of the scripts in this collection came from other sources and may have different licensing - if they do, their license information is included inline in the script source.
Included Scripts
| Script | Original Source | Description |
|---|---|---|
git-add-username-remote |
Ryan Tomayko's dotfiles | Adds a remote for the current repository for the given GitHub username. |
git-age |
Kristoffer Gronlund's wiki | A git-blame viewer, written using PyGTK. |
git-attic |
Leah Neukirchen's blog | Displays a list of deleted files in your repository. The output is designed to be copy and pasted: Pass the second field to git show to display the file contents, or just select the hash without ^ to see the commit where removal happened. |
git-authors |
Michael Markert's dotfiles (as git-changes) |
List authors in the repository in descending commit-count order. |
git-big-file |
Mislav MarohniÄ's dotfiles | Show files in the repository larger than a threshold size. |
git-branches-that-touch |
Mislav MarohniÄ's dotfiles | Shows which branches touch files under a path that are remote, unmerged, have a commit in the last six months and whose name doesn't start with 'enterprise-' |
git-branch-name |
Joe Block jpb@unixorn.net | Prints the current branch name in automation-friendly format. |
git-branch-rebaser |
Vengada Rangaraju krangaraju@castlighthealth.com | Kicks off an interactive rebase of all the commits on your branch. Including pushed commits, so be careful. |
git-change-author |
Michael Demmer in jut-io/git-scripts | Change one author/email in the history to another. |
git-change-log |
John Wiegley's git-scripts | Transform git log output into a complete Changelog for projects that haven't been maintaining one. |
git-changes |
Michael Markert's dotfiles | Symlink to git-authors. List authors in the repository in descending commit-count order. |
git-checkout-by-date |
? | Lets you checkout several files at once at the version specified by a date. |
git-checkout-commit |
From the fzf wiki | Uses fzf to checkout a commit, showing the commit diff as preview. |
git-checkout-default-branch |
I got tired of keeping track of which repositories use main, master or something else as default branch |
Checks out the default branch of the origin remote so you don't have to remember which repositories use master, main or whatever. |
git-checkout-pr |
Based on gist.github.com/gnarf/5406589 | Check out a PR locally |
git-checkout-preview |
From the fzf wiki | Uses fzf to checkout a branch, showing what commits diverge between the branches. |
git-children-of |
John Wiegley's git-scripts | Shows the children of a given git commit |
git-churn |
Gary Bernhardt's dotfiles | Show which files are getting changed most often in the repository. |
git-commit-browser |
From the fzf wiki | Uses fzf to browse commit history. |
git-clone-subset |
Rodrigo Silva (MestreLion) linux@rodrigosilva.com | Uses git clone and git filter-branch to remove from the clone all files but the ones requested, along with their associated commit history. |
git-comma |
Leah Neukirchen's blog | Adds and commits a file in one command |
git-conflicts |
Seth Messer's bits and bobs repository | Show files with conflicts |
git-copy-branch-name |
Zach Holman's dotfiles | Copy the current branch's name to the clipboard (macOS Only). |
git-credit |
Zach Holman's dotfiles | Quicker way to assign credit to another author on the latest commit. |
git-current-branch |
Joe Block jpb@unixorn.net | Prints the name of the current branch with no odd characters or formatting, mainly useful in automation scripts. |
git-cut-branch |
Ryan Tomayko's dotfiles | Create a new branch pointed at HEAD and reset the current branch to the head of its tracking branch |
git-delete-dangling-commits |
Stack Overflow | Clean up dangling commits that are not on any branch |
git-delete-local-merged |
From a deleted post by @tekkub | Delete all local branches that have been merged into HEAD. |
git-delete-merged-branches |
? | Purges all branches that have been merged to a target branch (defaults to branches merged to master). |
git-delete-squashed-and-merged-branches |
Paul Irish's dotfiles | Purges all branches that have been squashed and merged to a target branch (defaults to branches merged to master). Requires pygithub. |
git-delete-tag |
Joe Block jpb@unixorn.net | Delete a tag, both locally and from the origin remote. |
git-diff-last |
Sebastian Schuberth | Show the last change made to a file in the repository. |
git-divergence |
Gary Bernhardt's dotfiles | Shows differences between local branch and its tracking branch. |
git-edit-conflicts |
Joe Block jpb@unixorn.net | Edit the files that are marked as conflicted during a merge/rebase in your $EDITOR/$VISUAL. |
git-fetch-prs |
Pretty sure I saw this on slack, but can't recall which one | Get all Pull Request branches as local remote branches by refspec |
git-files |
Jake Zimmerman's blog | List the files different between the current branch and $REVIEW_BRANCH, which if unset defaults to the repository's default branch |
git-find-dirty |
Matthew McCullough's scripts repository | |
git-flush |
John Wiegley's git-scripts | Compact your repository by dropping all reflogs, stashes, and other cruft that may be bloating your pack files. |
git-force-mtimes |
John Wiegley's git-scripts | Sets modification times of all files in the repository their last change date based on git's log. Useful to avoid too new dates after a checkout confusing make or rake. |
git-forest |
Jan Engelhardt | Prints a text-based tree visualisation of your repository. Requires Git.pm |
git-functionlog |
Joe Block jpb@unixorn.net | Allows you to get a git log of a particular function, not a file |
git-fzf-add |
Fuzzy Finding in Bash with fzf | Use fzf to select files to add to git |
git-fzf-log-browser |
Fuzzy Finding in Bash with fzf | Use fzf to browse the repository's git log |
git-fzf-pickaxe-browser |
Fuzzy Finding in Bash with fzf | Use fzf to display a git log list that has been filtered with pickaxe for a search term. |
git-fzf-reflog-browser |
Fuzzy Finding in Bash with fzf | Use fzf to browse the repository's git reflog list that can be filtered by entering a fuzzy term at the prompt. Navigation up and down the hash list will preview the changes of each hash. |
git-git |
Joe Block jpb@unixorn.net | Typing git git foo will make git do a git foo instead of complaining. |
git-github-open |
? | Open GitHub file/blob page for FILE on LINE. |
git-gitlab-mr |
Noel Cower's gist | Open a merge request on GitLab |
git-history-graph |
? | Pretty git log, single line per commit, with branch graphing |
git-ignored |
? | Show files being ignored by git in the repository. |
git-improved-merge |
Mislav MarohniÄ's dotfiles | Sophisticated git merge with integrated CI check and automatic cleanup. |
git-incoming |
Michael Markert's dotfiles | Show commits in the tracking branch that are not in the local branch. |
git-lines |
Neil Killeen nkilleen@castlighthealth.com | Gives you a list of author names with the number of lines last updated by that user in files in the current directory tree with the extension specified. |
git-ls-branch-files |
Joe Block | List files changed between a specified branch and the current branch |
git-ls-object-refs |
Ryan Tomayko's dotfiles | Find references to an object with SHA1 in refs, commits, and trees. All of them. |
git-maildiff |
Sanjeev Kumar's blogpost | A simple git command to email diff in color to reviewer/ co-worker. |
git-maxpack |
John Wiegley's git-scripts | Compress a repository's pack files as much as possible. |
git-move-commits |
Corey Oordt's git-scripts | git move-commits num-commits correct-branch moves the last n commits to correct-branch (creating it if necessary). |
git-neck |
Leah Neukirchen's blog | Show commits from the HEAD until the first branching point. Companion script for git-trail. |
git-nuke |
Zach Holman's dotfiles | Nukes a branch locally and on the origin remote. |
git-object-deflate |
Ryan Tomayko's dotfiles | Deflate an loose object file and write to standard output. |
git-oldest-common-ancestor |
Lee Dohm's dotfiles | Finds the oldest common ancestor commit between two branches. |
git-origin-head |
Don't recall, maybe twitter | Prints the name of the origin remote's default branch. Not every repository uses main or master. |
git-outgoing |
Michael Markert's dotfiles | Show commits that are on the local branch that have not been pushed to the tracking branch. |
git-overwritten |
Mislav MarohniÄ's dotfiles | Aggregates git blame information about original owners of lines changed or removed in the ' |
git-pie-ify |
JeeBak Kim's gist | git pie-ify pattern replacement |
git-plotrepo |
Matthew McCullogh's scripts collection | Uses dot to draw a graph of the repository. |
git-promote |
Trevor's Improving My git Workflow blog post (404 now) | Promotes a local topic branch to a remote tracking branch of the same name. |
git-prune-branches |
Michael Demmer in jut-io/git-scripts | Deletes each fully merged branch after prompting for confirmation, than asks if you want the deleted branches deleted from your upstream remotes. |
git-pruneall |
Ryan Tomayko's dotfiles | Prune branches from specified remotes, or all remotes when no remote is specified. |
git-publish |
Michael Markert's dotfiles | git publish remote [remote-branch] |
git-purge-from-history |
David Underhillās blog | Permanently delete files or folders from your git repository. |
git-pylint |
Joe Block jpb@unixorn.net | Runs pylint on any .py files modified or added in the git status output. |
git-rank-contributors |
William Morgan wmorgan-git-wt-add@masanjin.net | Rummages through the changelog and orders contributors by the size of the diffs they're responsible for. |
git-rebase-authors |
Mislav MarohniÄ's dotfiles | Adds authorship info to interactive git rebase output |
git-rebase-theirs |
Rodrigo Silva (MestreLion) linux@rodrigosilva.com | Resolve rebase conflicts by favoring 'theirs' version. |
git-recent |
Mine | Shows information about most recent commit on all local branches |
git-recently-checkedout-branches |
Mislav MarohniÄ's dotfiles | Shows timestamp and name of recently checked-out branches in reverse chronological order. |
git-ref-recent |
Y combinator article | Shows the date, branch name, commit hash, and commit subject of branches, from most recently modified to oldest branches. |
git-rel |
Ryan Tomayko's dotfiles | Shows the relationship between the current branch and ref. With no ref, the current branch's remote tracking branch is used. |
git-related |
Mislav MarohniÄ's dotfiles | Show other files that often get changed in commits that touch <file>. |
git-remote-default-branch |
Mine | Shows the default branch for a specified remote, defaults to origin when no remote is specified. |
git-rename-branches |
Rodrigo Silva (MestreLion) linux@rodrigosilva.com | Rename multiple branches that start with a given name. |
git-reset-with-fire |
Joe Block jpb@unixorn.net | Hard reset the working directory, then zap any files not known to git. |
git-restore-mtime |
Rodrigo Silva (MestreLion) linux@rodrigosilva.com | Change mtime of files based on commit date of last change. |
git-reup |
Zach Holman's dotfiles | Like git pull but show a short and sexy log of changes after merging or rebasing. |
git-rm-deleted-from-repo |
Joe Block jpb@unixorn.net | Removes files you deleted with rm from the repository for you. |
git-root-directory |
Joe Block jpb@unixorn.net | Prints the path to the root of the git repository you're in. |
git-run-command-on-revisions |
Gary Bernhardt's dotfiles | Runs a given command over a range of git revisions. |
git-shamend |
Danielle Sucher's git-shamend blog post | Amends your staged changes as a fixup (keeping the pre-existing commit message) to the specified commit, or HEAD if no revision is specified. |
git-show-overwritten |
Mislav MarohniÄ's dotfiles | Aggregates git blame information about the original owners of lines changed or removed in the ' |
git-shrink-repo |
Based on gimbo/gimbo-git.zsh | Shrinks your clone of a git repository. |
git-sp |
A. Schwarz's git-sp | "Simple push", single short command to commit, and push. Use -a flag to add all files to commit. |
git-sr |
Noel Cower's git-sr | Use fzf to switch to a different git ref. |
git-stats |
Jake Zimmerman's blog | Displays stats for the files different between the current branch and $REVIEW_BRANCH, which if unset defaults to the repository's default branch |
git-submodule-rm |
Greg V's dotfiles & Pascal Sommer | Allows you to remove a submodule easily with git submodule-rm path/to/submodule. |
git-switch-branch |
Andrew Steele's dotfiles | Make it easier to switch to a branch by a substring of its name. More useful if you are good about deleting branches which have been merged upstream and if your branch names include unique identifiers like ticket/issue numbers or feature names. |
git-tag-and-sign |
? | Create and sign a new tag |
git-tag-diff |
John Wiegley's git-scripts | Show the differences between local tags and ones on the remote, if any |
git-thanks |
Mislav MarohniÄ's dotfiles | List the contributors to a repository in descending commit order, even if their contribution has been completely replaced. |
git-track |
Zach Holman's dotfiles | Sets up your branch to track a remote branch. Assumes you mean origin/localbranchname. |
git-trail |
Leah Neukirchen's blog | Show all branching points in the repository's git history so you can see how to reach commits in the current branch from other branches. |
git-undelete |
? | Undeletes a file. |
git-undo-push |
? | Undoes your last push to branch $1 of origin |
git-undo |
? | Undoes your last commit but keeps the changes in place. |
git-unpushed |
Zach Holman's dotfiles | Show the diff of everything you haven't pushed to the origin remote yet |
git-unreleased |
Mislav MarohniÄ's dotfiles | Shows git commits since the last tagged version. |
git-up |
Zach Holman's dotfiles | Like git pull but show a short and sexy log of changes after merging or rebasing. |
git-upstream-sync |
Joe Block jpb@unixorn.net | Fetches upstream/yourforkname and rebases it into your local fork, then pushes to your origin remote. |
git-what-the-hell-just-happened |
Gary Bernhardt's dotfiles | Show what just happened. |
git-when-merged |
Michael Haggerty git-when-merged | Find when a commit was merged into one or more branches. |
git-where |
Mislav MarohniÄ's dotfiles | Shows where a particular commit falls between releases. |
git-whoami |
Peter Eisentraut | Shows what username & email you have configured for the repository you're in |
git-winner |
Garry Dolley https://github.com/uptheirons/git-winner | Shows what authors have made the most commits, both by number of commits and by number of lines changed. |
git-wordiness |
Noel Cower | Shows how wordy people's commit messages are. Useful for shaming the folks who commit atrocities like git commit -m fixup |
git-wtf |
William Morgan wmorgan-git-wt-add@masanjin.net | git-wtf displays the state of your repository in a readable, easy-to-scan format. It's useful for getting a summary of how a branch relates to a remote server, and for wrangling many topic branches. |
github-open |
Ryan Tomayko's dotfiles |
Useful git aliases
Here are some helpful aliases for your ~/.gitconfig
| alias | Description |
|---|---|
ahead-of-master = log --oneline origin/master..HEAD |
Show commits that haven't made it to master yet. |
fetch-pull-requests = fetch origin '+refs/pull/*/head:refs/remotes/origin/pull/*' |
Fetch pull requests from GitHub so you can git checkout pull/123 and test them locally. |
roots = log --all --oneline --decorate --max-parents=0 |
Show the root commits. |
unpushed = log @{u}.. |
Show which commits have not been pushed to the tracking branch and are safe to amend/rebase. |
work-in-progress = rebase -i @{u} |
Starts an interactive rebase of all the commits you haven't pushed yet. Handy for collapsing a bunch of work-in-progress snapshots into logical commits before pushing, without having to worry about accidentally squashing a commit someone else has already referred to. |
Requires:
- A recent version of
git - Python 3+
- Ruby 2.2+
Thanks
Many thanks to all the contributors over the years.
Made with contributors-img.