Repository navigation
Add remaining git abbreviations from oh-my-zsh and fish plugin-git - #1298
Merged
fdncred merged 1 commit intoOct 21, 2026
Merged
Conversation
Contributor
|
sounds good. ping me when you're ready |
`aliases/git` and `abbreviations/git` are ports of the oh-my-zsh git
plugin, but a few names never made it across; the fish `plugin-git`
(a port of the same alias set with extras) has more that are useful.
From oh-my-zsh, which the port dropped:
g ggsup glom grbmi grbmia grbom gsuri gwtrm
From fish `plugin-git`:
gcav gcav! gcfx gcv gscam
gdg gdsc gdto gdwc
gfm ggl ggp ggp! ggpnp ggu
gclean! grbdia grbdi grbomi grbomia grhpa grpo
gsur gwtlo gwtpr gwtulo
Both files get the same set, since they are meant to stay in sync;
`gwta` is added to the abbreviation file only, where the alias already
existed. Names that only restate an existing one with a different flag
(`gp!`, `gmt`, `gpo`, `glr`, `gloo`, `gcod`, `gcom`, `gban`) are left
out to avoid duplicate spellings, as are the `git flow` and GitLab
merge request aliases.
Three implementation notes:
- `grbom`/`grbomi`/`grbomia` and `gfm` fetch the default branch and then
rebase/merge `FETCH_HEAD`, rather than using a possibly stale
`origin/<main>`.
- `glom` uses string interpolation because `(git_main_branch)..` is
parsed by nushell as an integer range, not as a git revision range.
- `gfm`, `ggpnp` and the `grbom*` names are `def`s, as they run two
commands.
DavSanchez
force-pushed
the
feat/git-abbreviations-port-gaps
branch
from
October 21, 2026 17:30
73cf5e3 to
7e8cd9f
Compare
DavSanchez
marked this pull request as ready for review
October 21, 2026 17:30
Contributor
|
Thanks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
aliases/gitandabbreviations/gitare ports of the oh-my-zsh git plugin,but a few names never made it across, and the fish
plugin-gitpackage (a port of thesame alias set, plus extras) has more that are worth having. This adds all of
them to both files.
Dropped by the oh-my-zsh port (8)
ggitggsupgit branch --set-upstream-to origin/<current>glomgit log --oneline --decorate <main>..grbmi/grbmiagit rebase <main> --interactive [--autosquash]grbomgit fetch origin <main>; git rebase FETCH_HEADgsurigit submodule update --recursive --initgwtrmgit worktree removeFrom fish
plugin-git(26)gcav,gcav!,gcfx,gcv,gscamgdg,gdsc,gdto,gdwcgfmggl,ggp,ggp!,ggpnp,ggugrbdi,grbdia,grbomi,grbomiagclean!,grhpa,grpogwtlo,gwtpr,gwtulogsurgwtais added to the abbreviation file only, where the alias was alreadypresent.
Deliberately left out: names that only restate an existing one with a
different flag (
gp!=gpf,gmt=gmtl,gpo,glr=gup,gloo,gcod=gcd,gcom=gcm,gban=gbnm), thegit flowfamily, andthe GitLab merge-request push aliases.
Implementation notes:
grbom/grbomi/grbomiaandgfmfetch the default branch and thenrebase or merge
FETCH_HEAD, instead of using a possibly staleorigin/<main>. Say the word if you would rather have literal oh-my-zshparity.
glomuses string interpolation because(git_main_branch)..is parsed bynushell as an integer range, not as a git revision range.
gfm,ggpnpand thegrbom*names aredefs because they run twocommands.
gis the only one I am unsure about; happy to drop it.Tested in a throwaway repo (diverged branch, autosquash, force-with-lease,
worktree lock/prune, remote prune,
--fixup) on nushell 0.116.1. Both filespass
toolkit check pr.