Merge remote-tracking branch 'upstream/master' into merge_upstream

* 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

.gitignore

@@ -9,3 +9,4 @@ log/
 
 # editor configs
 .vscode
+.idea