https://github.com/favware/zsh-git-enhanced
Enhanced Git aliases for oh-my-zsh
https://github.com/favware/zsh-git-enhanced
Last synced: 11 months ago
JSON representation
Enhanced Git aliases for oh-my-zsh
- Host: GitHub
- URL: https://github.com/favware/zsh-git-enhanced
- Owner: favware
- License: mit
- Created: 2020-01-29T10:46:02.000Z (over 6 years ago)
- Default Branch: main
- Last Pushed: 2025-01-23T09:21:58.000Z (over 1 year ago)
- Last Synced: 2025-07-13T19:40:49.085Z (11 months ago)
- Language: Shell
- Size: 70.3 KB
- Stars: 4
- Watchers: 2
- Forks: 0
- Open Issues: 1
-
Metadata Files:
- Readme: README.md
- Funding: .github/FUNDING.yml
- License: LICENSE
Awesome Lists containing this project
README
# zsh-git-enhanced
## Installation
The easiest way to install this plugin is to use [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh).
1. First clone the plugin repository into your custom plugins directory, for example:
```zsh
git clone https://github.com/favware/zsh-git-enhanced.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-git-enhanced
```
2. Add the plugin to the list of plugins for Oh My Zsh to load (inside `~/.zshrc`):
```zsh
plugins=(zsh-git-enhanced)
```
3. If you previously had the base `git` plugin be sure to remove it from the plugins list!
4. Start a new terminal session.
The git plugin provides many [aliases](#aliases) and a few useful [functions](#functions).
## Aliases
| Alias | Command |
| :------------------- | :---------------------------------------------------------------------------------------------------------------------- |
| g | `git `|
| ga | `git add `|
| gaa | `git add --all `|
| gapa | `git add --patch `|
| gau | `git add --update `|
| gav | `git add --verbose `|
| gap | `git apply `|
| gb | `git branch `|
| gba | `git branch -a `|
| gbd | `git branch -d `|
| gbda | `git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d `|
| gbD | `git branch -D `|
| gbl | `git blame -b -w `|
| gbnm | `git branch --no-merged `|
| gbr | `git branch --remote `|
| gbs | `git bisect `|
| gbsb | `git bisect bad `|
| gbsg | `git bisect good `|
| gbsr | `git bisect reset `|
| gbss | `git bisect start `|
| gc | `git commit -v `|
| gc! | `git commit -v --amend `|
| gcn! | `git commit -v --no-edit --amend `|
| gca | `git commit -v -a `|
| gca! | `git commit -v -a --amend `|
| gcan! | `git commit -v -a --no-edit --amend `|
| gcans! | `git commit -v -a -s --no-edit --amend `|
| gcam | `git commit -a -m `|
| gcsm | `git commit -s -m `|
| gcb | `git checkout -b `|
| gcf | `git config --list `|
| gcl | `git clone --recurse-submodules `|
| gclean | `git clean -id `|
| gpristine | `git reset --hard && git clean -dfx `|
| gcm | `git checkout master `|
| gcd | `git checkout develop `|
| gcmsg | `git commit -m `|
| gco | `git checkout `|
| gcount | `git shortlog -sn `|
| gcp | `git cherry-pick `|
| gcpa | `git cherry-pick --abort `|
| gcpc | `git cherry-pick --continue `|
| gcs | `git commit -S `|
| gd | `git diff `|
| gdca | `git diff --cached `|
| gdcw | `git diff --cached --word-diff `|
| gdct | `git describe --tags \$(git rev-list --tags --max-count=1) `|
| gds | `git diff --staged `|
| gdt | `git diff-tree --no-commit-id --name-only -r `|
| gdv | `git diff -w \$@ \| view - `|
| gdw | `git diff --word-diff `|
| gf | `git fetch `|
| gfa | `git fetch --all --prune `|
| gfg | `git ls-files \| grep `|
| gfo | `git fetch origin `|
| gg | `git gui citool `|
| gga | `git gui citool --amend `|
| ggf | `git push --force origin \$(current_branch) `|
| ggfl | `git push --force-with-lease origin \$(current_branch) `|
| ggl | `git pull origin \$(current_branch) `|
| ggp | `git push origin \$(current_branch) `|
| ggpnp | `ggl && ggp `|
| ggpull | `git pull origin "\$(git_current_branch)" `|
| ggpur | `ggu `|
| ggpush | `git push origin "\$(git_current_branch)" `|
| ggsup | `git branch --set-upstream-to=origin/\$(git_current_branch) `|
| ggu | `git pull --rebase origin \$(current_branch) `|
| gpsup | `git push --set-upstream origin \$(git_current_branch) `|
| ghh | `git help `|
| gignore | `git update-index --assume-unchanged `|
| gignored | `git ls-files -v \| grep "^[[:lower:]]" `|
| gk | `gitk --all --branches `|
| gke | `gitk --all \$(git log -g --pretty=%h) `|
| gl | `git pull `|
| glg | `git log --stat `|
| glgp | `git log --stat -p `|
| glgg | `git log --graph `|
| glgga | `git log --graph --decorate --all `|
| glgm | `git log --graph --max-count=10 `|
| glo | `git log --oneline --decorate `|
| glol | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' `|
| glols | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat `|
| glod | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' `|
| glods | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short `|
| glola | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all `|
| glog | `git log --oneline --decorate --graph `|
| gloga | `git log --oneline --decorate --graph --all `|
| glp | `_git_log_prettily` |
| gm | `git merge `|
| gmom | `git merge origin/master `|
| gmt | `git mergetool --no-prompt `|
| gmtvim | `git mergetool --no-prompt --tool=vimdiff `|
| gmum | `git merge upstream/master `|
| gma | `git merge --abort `|
| gp | `git push `|
| gpd | `git push --dry-run `|
| gpf | `git push --force-with-lease `|
| gpf! | `git push --force `|
| gpoat | `git push origin --all && git push origin --tags `|
| gpu | `git push upstream `|
| gpv | `git push -v `|
| gr | `git remote `|
| gra | `git remote add `|
| grau | `git remote add upstream `|
| grad | `git remote add downstream `|
| grb | `git rebase `|
| grba | `git rebase --abort `|
| grbc | `git rebase --continue `|
| grbd | `git rebase develop `|
| grbi | `git rebase -i `|
| grbm | `git rebase $(git_main_branch) `|
| grbom | `git rebase origin/$(git_main_branch) `|
| grbum | `git rebase upstream/$(git_main_branch) `|
| grbs | `git rebase --skip `|
| grev | `git revert `|
| grh | `git reset `|
| grhh | `git reset --hard `|
| groh | `git reset origin/\$(git_current_branch) --hard `|
| grm | `git rm `|
| grmc | `git rm --cached `|
| grmv | `git remote rename `|
| grrm | `git remote remove `|
| grs | `git restore `|
| grset | `git remote set-url `|
| grss | `git restore --source `|
| grt | `cd "\$(git rev-parse --show-toplevel \|\| echo .)" `|
| gru | `git reset -- `|
| grup | `git remote update `|
| grv | `git remote -v `|
| gsb | `git status -sb `|
| gsd | `git rebase -i HEAD~$(git rev-list --count origin/$(git_main_branch)..$(git rev-parse --abbrev-ref HEAD)) `|
| gsh | `git show `|
| gsi | `git submodule init `|
| gsps | `git show --pretty=short --show-signature `|
| gss | `git status -s `|
| gst | `git status `|
| gsta | `git stash push `|
| gsta | `git stash save `|
| gstaa | `git stash apply `|
| gstc | `git stash clear `|
| gstd | `git stash drop `|
| gstl | `git stash list `|
| gstr | `interactive renaming of an existing stash `|
| gstp | `git stash pop `|
| gsts | `git stash show --text `|
| gstall | `git stash --all `|
| gsu | `git submodule update `|
| gsw | `git switch `|
| gswc | `git switch -c `|
| gts | `git tag -s `|
| gtv | `git tag \| sort -V `|
| gtl | `gtl(){ git tag --sort=-v:refname -n -l \${1}\* }; noglob gtl `|
| gunignore | `git update-index --no-assume-unchanged `|
| gunwip | `git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1 `|
| gup | `git pull --rebase `|
| gupv | `git pull --rebase -v `|
| gupa | `git pull --rebase --autostash `|
| gupav | `git pull --rebase --autostash -v `|
| glum | `git pull upstream master `|
| gwch | `git whatchanged -p --abbrev-commit --pretty=medium `|
| gwip | `git add -A; git rm \$(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]" `|
| grlm | `git rev-list --count master..\$(git_current_branch) `|
| grlmo | `git rev-list --count origin/master..\$(git_current_branch) `|
### [`Git-Duet`] specific tags
| Alias | Command |
| :---- | :------------------------------------------------ |
| gdc | `git duet-commit -vs `|
| gdci | `git duet-commit -vs `|
| gdr | `git duet-revert -v `|
| gdrv | `git duet-revert -v `|
| gdm | `git duet-merge -v `|
| gdmg | `git duet-merge -v `|
| gfix | `git duet-commit -s --amend --reset-author -C HEAD `|
### Deprecated
These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support.
| Alias | Command | Modification |
| :----- | :--------------------------------------------------- | ------------------------------------------------------ |
| gap | `git add --patch ` | new alias `gapa` |
| gcl | `git config --list ` | new alias `gcf` |
| gdc | `git diff --cached ` | new alias `gdca` |
| gdt | `git difftool ` | no replacement |
| ggpull | `git pull origin \$(current_branch) ` | new alias `ggl` (`ggpull` still exists for now though) |
| ggpur | `git pull --rebase origin \$(current_branch) ` | new alias `ggu` (`ggpur` still exists for now though) |
| ggpush | `git push origin \$(current_branch) ` | new alias `ggp` (`ggpush` still exists for now though) |
| gk | `gitk --all --branches ` | now aliased to `gitk --all --branches` |
| glg | `git log --stat --max-count = 10 ` | now aliased to `git log --stat --color` |
| glgg | `git log --graph --max-count = 10 ` | now aliased to `git log --graph --color` |
| gwc | `git whatchanged -p --abbrev-commit --pretty = medium` | new alias `gwch` |
## Functions
### Current
| Command | Description |
| :--------------------- | :------------------------------------ |
| current_branch | Return the name of the current branch |
| git_current_user_name | Returns the `user.name` config value |
| git_current_user_email | Returns the `user.email` config value |
### Work in Progress (WIP)
These features allow to pause a branch development and switch to another one (_"Work in Progress"_, or wip). When you want to go back to work, just unwip it.
| Command | Description |
| :--------------- | :---------------------------------------------- |
| work_in_progress | Echoes a warning if the current branch is a wip |
| gwip | Commit wip branch |
| gunwip | Uncommit wip branch |
### Deprecated
| Command | Description | Reason |
| :----------------- | :-------------------------------------- | :-------------------------------------------------------------- |
| current_repository | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) |
[`git-duet`]: https://github.com/git-duet/git-duet