* upstream/master:
feat(git): add aliases for gone branches (#9250)
feat(git): add `gpod` alias
chore: add `.idea` directory to `.gitignore`
fix(gcloud): add location of latest snap install (#11502)
fix(theme-and-appearance): test color ls with $ZSH directory
fix(correction)!: remove aliases for non standard commands
fix(af-magic): fix python venv checking logic (#11495)
docs(lib/directories): comment how to disable alias (#11489)
docs(lando): php support (#11491)
fix(fzf): installation dir for brew M1 (#11490)
fix(gradle): move compdef line (#11488)
feat(amuse): add virtualenv support (#8987)
feat(gradle): update completion from upstream (#11485)
fix(git): `gpristine` requires two `--force` flags
docs(git): remove duplicated line
feat(azure): add `azure` plugin (#8848)
feat(zsh-interactive-cd): sync version with upstream (#11024)
feat(git)!: add `force-if-includes` flag (#11481)
Conflicts:
.gitignore
There are workspace settings for vscode plugins that make contributing to ohmyzsh easier. However, these would be noisy for users, especially for those that don't use vscode.
Use add-zsh-hook to add functions to hooks. That way they won't be added again
when doing `source ~/.zshrc` multiple times.
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
- `custom/example.zshcache` doesn't exist anymore: it's safe to
ignore.
- `*.swp` files are ignored for no apparent reason. There's nothing
in the codebase that generates them. This was introduced by @lepht
in commit f78218f6 on 24 May 2011.
- Files `locals.zsh` and `projects.zsh` are no longer supported for
putting custom configuration there.
This is since commit 8debd09 where files were put in a lib/
folder, but failed to modify the .gitignore file as well.
The init script was modified as well, so those files aren't even
being sourced: they are safe to be deleted or ported into a custom
script.
