be gone
This commit is contained in:
435
zsh/git.zsh
435
zsh/git.zsh
@@ -1,435 +0,0 @@
|
|||||||
# Outputs current branch info in prompt format
|
|
||||||
function git_prompt_info() {
|
|
||||||
local ref
|
|
||||||
if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
|
|
||||||
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
|
|
||||||
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Checks if working tree is dirty
|
|
||||||
function parse_git_dirty() {
|
|
||||||
local STATUS=''
|
|
||||||
local FLAGS
|
|
||||||
FLAGS=('--porcelain')
|
|
||||||
if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
|
|
||||||
if [[ $POST_1_7_2_GIT -gt 0 ]]; then
|
|
||||||
FLAGS+='--ignore-submodules=dirty'
|
|
||||||
fi
|
|
||||||
if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
|
|
||||||
FLAGS+='--untracked-files=no'
|
|
||||||
fi
|
|
||||||
STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
|
|
||||||
fi
|
|
||||||
if [[ -n $STATUS ]]; then
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
|
||||||
else
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Gets the difference between the local and remote branches
|
|
||||||
function git_remote_status() {
|
|
||||||
local remote ahead behind git_remote_status git_remote_status_detailed
|
|
||||||
remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
|
|
||||||
if [[ -n ${remote} ]]; then
|
|
||||||
ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
|
|
||||||
behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
|
|
||||||
|
|
||||||
if [[ $ahead -eq 0 ]] && [[ $behind -eq 0 ]]; then
|
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
|
|
||||||
elif [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then
|
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
|
|
||||||
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}"
|
|
||||||
elif [[ $behind -gt 0 ]] && [[ $ahead -eq 0 ]]; then
|
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
|
|
||||||
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
|
|
||||||
elif [[ $ahead -gt 0 ]] && [[ $behind -gt 0 ]]; then
|
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
|
|
||||||
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
|
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo $git_remote_status
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Outputs the name of the current branch
|
|
||||||
# Usage example: git pull origin $(git_current_branch)
|
|
||||||
# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if
|
|
||||||
# it's not a symbolic ref, but in a Git repo.
|
|
||||||
function git_current_branch() {
|
|
||||||
local ref
|
|
||||||
ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null)
|
|
||||||
local ret=$?
|
|
||||||
if [[ $ret != 0 ]]; then
|
|
||||||
[[ $ret == 128 ]] && return # no git repo.
|
|
||||||
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
|
|
||||||
fi
|
|
||||||
echo ${ref#refs/heads/}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# Gets the number of commits ahead from remote
|
|
||||||
function git_commits_ahead() {
|
|
||||||
if command git rev-parse --git-dir &>/dev/null; then
|
|
||||||
local commits="$(git rev-list --count @{upstream}..HEAD)"
|
|
||||||
if [[ "$commits" != 0 ]]; then
|
|
||||||
echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$commits$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Gets the number of commits behind remote
|
|
||||||
function git_commits_behind() {
|
|
||||||
if command git rev-parse --git-dir &>/dev/null; then
|
|
||||||
local commits="$(git rev-list --count HEAD..@{upstream})"
|
|
||||||
if [[ "$commits" != 0 ]]; then
|
|
||||||
echo "$ZSH_THEME_GIT_COMMITS_BEHIND_PREFIX$commits$ZSH_THEME_GIT_COMMITS_BEHIND_SUFFIX"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Outputs if current branch is ahead of remote
|
|
||||||
function git_prompt_ahead() {
|
|
||||||
if [[ -n "$(command git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Outputs if current branch is behind remote
|
|
||||||
function git_prompt_behind() {
|
|
||||||
if [[ -n "$(command git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_BEHIND"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Outputs if current branch exists on remote or not
|
|
||||||
function git_prompt_remote() {
|
|
||||||
if [[ -n "$(command git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS"
|
|
||||||
else
|
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Formats prompt string for current git commit short SHA
|
|
||||||
function git_prompt_short_sha() {
|
|
||||||
local SHA
|
|
||||||
SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Formats prompt string for current git commit long SHA
|
|
||||||
function git_prompt_long_sha() {
|
|
||||||
local SHA
|
|
||||||
SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Get the status of the working tree
|
|
||||||
function git_prompt_status() {
|
|
||||||
local INDEX STATUS
|
|
||||||
INDEX=$(command git status --porcelain -b 2> /dev/null)
|
|
||||||
STATUS=""
|
|
||||||
if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^A ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
|
|
||||||
elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
|
||||||
elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
|
||||||
elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
|
||||||
elif $(echo "$INDEX" | grep '^D ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
|
||||||
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
|
||||||
fi
|
|
||||||
if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^## [^ ]\+ .*ahead' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^## [^ ]\+ .*behind' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
|
|
||||||
fi
|
|
||||||
if $(echo "$INDEX" | grep '^## [^ ]\+ .*diverged' &> /dev/null); then
|
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
|
|
||||||
fi
|
|
||||||
echo $STATUS
|
|
||||||
}
|
|
||||||
|
|
||||||
# Compares the provided version of git to the version installed and on path
|
|
||||||
# Outputs -1, 0, or 1 if the installed version is less than, equal to, or
|
|
||||||
# greater than the input version, respectively.
|
|
||||||
function git_compare_version() {
|
|
||||||
local INPUT_GIT_VERSION INSTALLED_GIT_VERSION
|
|
||||||
INPUT_GIT_VERSION=(${(s/./)1})
|
|
||||||
INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null))
|
|
||||||
INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]})
|
|
||||||
|
|
||||||
for i in {1..3}; do
|
|
||||||
if [[ $INSTALLED_GIT_VERSION[$i] -gt $INPUT_GIT_VERSION[$i] ]]; then
|
|
||||||
echo 1
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then
|
|
||||||
echo -1
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Outputs the name of the current user
|
|
||||||
# Usage example: $(git_current_user_name)
|
|
||||||
function git_current_user_name() {
|
|
||||||
command git config user.name 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
# Outputs the email of the current user
|
|
||||||
# Usage example: $(git_current_user_email)
|
|
||||||
function git_current_user_email() {
|
|
||||||
command git config user.email 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
# This is unlikely to change so make it all statically assigned
|
|
||||||
POST_1_7_2_GIT=$(git_compare_version "1.7.2")
|
|
||||||
# Clean up the namespace slightly by removing the checker function
|
|
||||||
unfunction git_compare_version
|
|
||||||
|
|
||||||
# The name of the current branch
|
|
||||||
# Back-compatibility wrapper for when this function was defined here in
|
|
||||||
# the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
|
|
||||||
# to fix the core -> git plugin dependency.
|
|
||||||
function current_branch() {
|
|
||||||
git_current_branch
|
|
||||||
}
|
|
||||||
# The list of remotes
|
|
||||||
function current_repository() {
|
|
||||||
if ! $_omz_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
echo $($_omz_git_git_cmd remote -v | cut -d':' -f 2)
|
|
||||||
}
|
|
||||||
# Pretty log messages
|
|
||||||
function _git_log_prettily(){
|
|
||||||
if ! [ -z $1 ]; then
|
|
||||||
git log --pretty=$1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
# Warn if the current branch is a WIP
|
|
||||||
function work_in_progress() {
|
|
||||||
if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
|
|
||||||
echo "WIP!!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
#
|
|
||||||
# Aliases
|
|
||||||
# (sorted alphabetically)
|
|
||||||
#
|
|
||||||
|
|
||||||
alias g='git'
|
|
||||||
|
|
||||||
alias ga='git add'
|
|
||||||
alias gaa='git add --all'
|
|
||||||
alias gapa='git add --patch'
|
|
||||||
alias gau='git add --update'
|
|
||||||
|
|
||||||
alias gb='git branch'
|
|
||||||
alias gba='git branch -a'
|
|
||||||
alias gbd='git branch -d'
|
|
||||||
alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
|
|
||||||
alias gbl='git blame -b -w'
|
|
||||||
alias gbnm='git branch --no-merged'
|
|
||||||
alias gbr='git branch --remote'
|
|
||||||
alias gbs='git bisect'
|
|
||||||
alias gbsb='git bisect bad'
|
|
||||||
alias gbsg='git bisect good'
|
|
||||||
alias gbsr='git bisect reset'
|
|
||||||
alias gbss='git bisect start'
|
|
||||||
|
|
||||||
alias gc='git commit -v'
|
|
||||||
alias gc!='git commit -v --amend'
|
|
||||||
alias gcn!='git commit -v --no-edit --amend'
|
|
||||||
alias gca='git commit -v -a'
|
|
||||||
alias gca!='git commit -v -a --amend'
|
|
||||||
alias gcan!='git commit -v -a --no-edit --amend'
|
|
||||||
alias gcans!='git commit -v -a -s --no-edit --amend'
|
|
||||||
alias gcam='git commit -a -m'
|
|
||||||
alias gcsm='git commit -s -m'
|
|
||||||
alias gcb='git checkout -b'
|
|
||||||
alias gcf='git config --list'
|
|
||||||
alias gcl='git clone --recursive'
|
|
||||||
alias gclean='git clean -fd'
|
|
||||||
alias gpristine='git reset --hard && git clean -dfx'
|
|
||||||
alias gcm='git checkout master'
|
|
||||||
alias gcd='git checkout develop'
|
|
||||||
alias gcmsg='git commit -m'
|
|
||||||
alias gco='git checkout'
|
|
||||||
alias gcount='git shortlog -sn'
|
|
||||||
alias gcp='git cherry-pick'
|
|
||||||
alias gcpa='git cherry-pick --abort'
|
|
||||||
alias gcpc='git cherry-pick --continue'
|
|
||||||
alias gcs='git commit -S'
|
|
||||||
|
|
||||||
alias gd='git diff'
|
|
||||||
alias gdca='git diff --cached'
|
|
||||||
alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
|
|
||||||
alias gdt='git diff-tree --no-commit-id --name-only -r'
|
|
||||||
alias gdw='git diff --word-diff'
|
|
||||||
|
|
||||||
gdv() { git diff -w "$@" | view - }
|
|
||||||
|
|
||||||
alias gf='git fetch'
|
|
||||||
alias gfa='git fetch --all --prune'
|
|
||||||
alias gfo='git fetch origin'
|
|
||||||
|
|
||||||
function gfg() { git ls-files | grep $@ }
|
|
||||||
|
|
||||||
alias gg='git gui citool'
|
|
||||||
alias gga='git gui citool --amend'
|
|
||||||
|
|
||||||
ggf() {
|
|
||||||
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
|
||||||
git push --force origin "${b:=$1}"
|
|
||||||
}
|
|
||||||
|
|
||||||
ggl() {
|
|
||||||
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
|
|
||||||
git pull origin "${*}"
|
|
||||||
else
|
|
||||||
[[ "$#" == 0 ]] && local b="$(git_current_branch)"
|
|
||||||
git pull origin "${b:=$1}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
ggp() {
|
|
||||||
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
|
|
||||||
git push origin "${*}"
|
|
||||||
else
|
|
||||||
[[ "$#" == 0 ]] && local b="$(git_current_branch)"
|
|
||||||
git push origin "${b:=$1}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
ggpnp() {
|
|
||||||
if [[ "$#" == 0 ]]; then
|
|
||||||
ggl && ggp
|
|
||||||
else
|
|
||||||
ggl "${*}" && ggp "${*}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
ggu() {
|
|
||||||
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
|
||||||
git pull --rebase origin "${b:=$1}"
|
|
||||||
}
|
|
||||||
|
|
||||||
alias ggpur='ggu'
|
|
||||||
|
|
||||||
alias ggpull='git pull origin $(git_current_branch)'
|
|
||||||
|
|
||||||
alias ggpush='git push origin $(git_current_branch)'
|
|
||||||
|
|
||||||
alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
|
|
||||||
alias gpsup='git push --set-upstream origin $(git_current_branch)'
|
|
||||||
|
|
||||||
alias ghh='git help'
|
|
||||||
|
|
||||||
alias gignore='git update-index --assume-unchanged'
|
|
||||||
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
|
|
||||||
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
|
||||||
|
|
||||||
alias gk='\gitk --all --branches'
|
|
||||||
alias gke='\gitk --all $(git log -g --pretty=%h)'
|
|
||||||
|
|
||||||
alias gl='git pull'
|
|
||||||
alias glg='git log --stat'
|
|
||||||
alias glgp='git log --stat -p'
|
|
||||||
alias glgg='git log --graph'
|
|
||||||
alias glgga='git log --graph --decorate --all'
|
|
||||||
alias glgm='git log --graph --max-count=10'
|
|
||||||
alias glo='git log --oneline --decorate'
|
|
||||||
alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
|
|
||||||
alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
|
|
||||||
alias glog='git log --oneline --decorate --graph'
|
|
||||||
alias gloga='git log --oneline --decorate --graph --all'
|
|
||||||
alias glp="_git_log_prettily"
|
|
||||||
|
|
||||||
alias gm='git merge'
|
|
||||||
alias gmom='git merge origin/master'
|
|
||||||
alias gmt='git mergetool --no-prompt'
|
|
||||||
alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
|
|
||||||
alias gmum='git merge upstream/master'
|
|
||||||
|
|
||||||
alias gp='git push'
|
|
||||||
alias gpd='git push --dry-run'
|
|
||||||
alias gpoat='git push origin --all && git push origin --tags'
|
|
||||||
alias gpu='git push upstream'
|
|
||||||
alias gpv='git push -v'
|
|
||||||
|
|
||||||
alias gr='git remote'
|
|
||||||
alias gra='git remote add'
|
|
||||||
alias grb='git rebase'
|
|
||||||
alias grba='git rebase --abort'
|
|
||||||
alias grbc='git rebase --continue'
|
|
||||||
alias grbi='git rebase -i'
|
|
||||||
alias grbm='git rebase master'
|
|
||||||
alias grbs='git rebase --skip'
|
|
||||||
alias grh='git reset HEAD'
|
|
||||||
alias grhh='git reset HEAD --hard'
|
|
||||||
alias grmv='git remote rename'
|
|
||||||
alias grrm='git remote remove'
|
|
||||||
alias grset='git remote set-url'
|
|
||||||
alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
|
|
||||||
alias gru='git reset --'
|
|
||||||
alias grup='git remote update'
|
|
||||||
alias grv='git remote -v'
|
|
||||||
|
|
||||||
alias gsb='git status -sb'
|
|
||||||
alias gsd='git svn dcommit'
|
|
||||||
alias gsi='git submodule init'
|
|
||||||
alias gsps='git show --pretty=short --show-signature'
|
|
||||||
alias gsr='git svn rebase'
|
|
||||||
alias gss='git status -s'
|
|
||||||
alias gst='git status'
|
|
||||||
alias gsta='git stash save'
|
|
||||||
alias gstaa='git stash apply'
|
|
||||||
alias gstc='git stash clear'
|
|
||||||
alias gstd='git stash drop'
|
|
||||||
alias gstl='git stash list'
|
|
||||||
alias gstp='git stash pop'
|
|
||||||
alias gsts='git stash show --text'
|
|
||||||
alias gsu='git submodule update'
|
|
||||||
|
|
||||||
alias gts='git tag -s'
|
|
||||||
alias gtv='git tag | sort -V'
|
|
||||||
|
|
||||||
alias gunignore='git update-index --no-assume-unchanged'
|
|
||||||
alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
|
|
||||||
alias gup='git pull --rebase'
|
|
||||||
alias gupv='git pull --rebase -v'
|
|
||||||
alias glum='git pull upstream master'
|
|
||||||
|
|
||||||
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
|
|
||||||
alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
#!/usr/bin/env zsh
|
|
||||||
#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
|
||||||
|
|
||||||
setopt promptsubst
|
|
||||||
|
|
||||||
autoload -U add-zsh-hook
|
|
||||||
|
|
||||||
PROMPT_SUCCESS_COLOR=$FG[117]
|
|
||||||
PROMPT_FAILURE_COLOR=$FG[124]
|
|
||||||
PROMPT_VCS_INFO_COLOR=$FG[242]
|
|
||||||
PROMPT_PROMPT=$FG[077]
|
|
||||||
GIT_DIRTY_COLOR=$FG[133]
|
|
||||||
GIT_CLEAN_COLOR=$FG[118]
|
|
||||||
GIT_PROMPT_INFO=$FG[012]
|
|
||||||
|
|
||||||
PROMPT='%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%}%{$GIT_PROMPT_INFO%}$(git_prompt_info)$(virtualenv_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ%{$reset_color%} '
|
|
||||||
|
|
||||||
#RPS1="${return_code}"
|
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" ("
|
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%})"
|
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
|
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
|
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"
|
|
||||||
|
|
||||||
ZSH_THEME_VIRTUALENV_PREFIX=" ["
|
|
||||||
ZSH_THEME_VIRTUALENV_SUFFIX="]"
|
|
||||||
Reference in New Issue
Block a user