forked from ohmyzsh/ohmyzsh
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
* upstream/master: Update README for git-prompt to clarify how to use (ohmyzsh#10922) fix(autojump): add macOS 'pkgsrc' installation location (ohmyzsh#12329) fix(lib/git): fix detection of function use in prompt perf(async): avoid executing `true` if not required (ohmyzsh#12318) fix(git): disable locally `ksharrays` fix(archlinux): make `upgrade` work with non-english feat(git): implement async completion for `git_prompt_status` (ohmyzsh#12319) feat(git)!: enable async git prompt (now for real) fix(async): avoid blocking the shell while waiting (ohmyzsh#12304) feat(httpie): complete https command (ohmyzsh#12314) feat(gcloud): add homebrew installation path (ohmyzsh#12308) fix(starship): keep `ZSH_THEME` if not installed (ohmyzsh#12309) style: remove trailing whitespace (ohmyzsh#12303) fix(poetry-env): activate only if env exists (ohmyzsh#12301) feat(terraform): add `tft` (`terraform test`) (ohmyzsh#12299) feat(jira): add help/usage cmd (ohmyzsh#12293) fix(ssh-agent): don't start new agent if screen/tmux symlink exists (ohmyzsh#12297)
- Loading branch information
Showing
88 changed files
with
234 additions
and
177 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
# Put files in this folder to add your own custom functionality. | ||
# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization | ||
# | ||
# | ||
# Files in the custom/ directory will be: | ||
# - loaded automatically by the init script, in alphabetical order | ||
# - loaded last, after all built-ins in the lib/ directory, to override them | ||
# - ignored by git by default | ||
# | ||
# | ||
# Example: add custom/shortcuts.zsh for shortcuts to your local projects | ||
# | ||
# | ||
# brainstormr=~/Projects/development/planetargon/brainstormr | ||
# cd $brainstormr |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
# Put your custom themes in this folder. | ||
# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes | ||
# | ||
# | ||
# Example: | ||
|
||
PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% " |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.