1
0
Fork 0

Tweaked sorin prompt as new moron prompt

pull/995/head
Brian Moran 9 years ago
parent 41b71590c3
commit 0874e37c31

@ -27,155 +27,155 @@ zstyle -s ':prezto:module:git:status:ignore' submodules '_git_status_ignore_subm
# #
# Git # Git
alias g='git' #alias g='git'
# Branch (b) # Branch (b)
alias gb='git branch' #alias gb='git branch'
alias gbc='git checkout -b' #alias gbc='git checkout -b'
alias gbl='git branch -v' #alias gbl='git branch -v'
alias gbL='git branch -av' #alias gbL='git branch -av'
alias gbx='git branch -d' #alias gbx='git branch -d'
alias gbX='git branch -D' #alias gbX='git branch -D'
alias gbm='git branch -m' #alias gbm='git branch -m'
alias gbM='git branch -M' #alias gbM='git branch -M'
alias gbs='git show-branch' #alias gbs='git show-branch'
alias gbS='git show-branch -a' #alias gbS='git show-branch -a'
# Commit (c) # Commit (c)
alias gc='git commit --verbose' #alias gc='git commit --verbose'
alias gca='git commit --verbose --all' #alias gca='git commit --verbose --all'
alias gcm='git commit --message' #alias gcm='git commit --message'
alias gco='git checkout' #alias gco='git checkout'
alias gcO='git checkout --patch' #alias gcO='git checkout --patch'
alias gcf='git commit --amend --reuse-message HEAD' #alias gcf='git commit --amend --reuse-message HEAD'
alias gcF='git commit --verbose --amend' #alias gcF='git commit --verbose --amend'
alias gcp='git cherry-pick --ff' #alias gcp='git cherry-pick --ff'
alias gcP='git cherry-pick --no-commit' #alias gcP='git cherry-pick --no-commit'
alias gcr='git revert' #alias gcr='git revert'
alias gcR='git reset "HEAD^"' #alias gcR='git reset "HEAD^"'
alias gcs='git show' #alias gcs='git show'
alias gcl='git-commit-lost' #alias gcl='git-commit-lost'
# Conflict (C) # Conflict (C)
alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"' #alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
alias gCa='git add $(gCl)' #alias gCa='git add $(gCl)'
alias gCe='git mergetool $(gCl)' #alias gCe='git mergetool $(gCl)'
alias gCo='git checkout --ours --' #alias gCo='git checkout --ours --'
alias gCO='gCo $(gCl)' #alias gCO='gCo $(gCl)'
alias gCt='git checkout --theirs --' #alias gCt='git checkout --theirs --'
alias gCT='gCt $(gCl)' #alias gCT='gCt $(gCl)'
# Data (d) # Data (d)
alias gd='git ls-files' #alias gd='git ls-files'
alias gdc='git ls-files --cached' #alias gdc='git ls-files --cached'
alias gdx='git ls-files --deleted' #alias gdx='git ls-files --deleted'
alias gdm='git ls-files --modified' #alias gdm='git ls-files --modified'
alias gdu='git ls-files --other --exclude-standard' #alias gdu='git ls-files --other --exclude-standard'
alias gdk='git ls-files --killed' #alias gdk='git ls-files --killed'
alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"' #alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"'
# Fetch (f) # Fetch (f)
alias gf='git fetch' #alias gf='git fetch'
alias gfc='git clone' #alias gfc='git clone'
alias gfm='git pull' #alias gfm='git pull'
alias gfr='git pull --rebase' #alias gfr='git pull --rebase'
# Grep (g) # Grep (g)
alias gg='git grep' #alias gg='git grep'
alias ggi='git grep --ignore-case' #alias ggi='git grep --ignore-case'
alias ggl='git grep --files-with-matches' #alias ggl='git grep --files-with-matches'
alias ggL='git grep --files-without-matches' #alias ggL='git grep --files-without-matches'
alias ggv='git grep --invert-match' #alias ggv='git grep --invert-match'
alias ggw='git grep --word-regexp' #alias ggw='git grep --word-regexp'
# Index (i) # Index (i)
alias gia='git add' #alias gia='git add'
alias giA='git add --patch' #alias giA='git add --patch'
alias giu='git add --update' #alias giu='git add --update'
alias gid='git diff --no-ext-diff --cached' #alias gid='git diff --no-ext-diff --cached'
alias giD='git diff --no-ext-diff --cached --word-diff' #alias giD='git diff --no-ext-diff --cached --word-diff'
alias gir='git reset' #alias gir='git reset'
alias giR='git reset --patch' #alias giR='git reset --patch'
alias gix='git rm -r --cached' #alias gix='git rm -r --cached'
alias giX='git rm -rf --cached' #alias giX='git rm -rf --cached'
# Log (l) # Log (l)
alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"' #alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"' #alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"' #alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"' #alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"' #alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"' #alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
alias glc='git shortlog --summary --numbered' #alias glc='git shortlog --summary --numbered'
# Merge (m) # Merge (m)
alias gm='git merge' #alias gm='git merge'
alias gmC='git merge --no-commit' #alias gmC='git merge --no-commit'
alias gmF='git merge --no-ff' #alias gmF='git merge --no-ff'
alias gma='git merge --abort' #alias gma='git merge --abort'
alias gmt='git mergetool' #alias gmt='git mergetool'
# Push (p) # Push (p)
alias gp='git push' #alias gp='git push'
alias gpf='git push --force' #alias gpf='git push --force'
alias gpa='git push --all' #alias gpa='git push --all'
alias gpA='git push --all && git push --tags' #alias gpA='git push --all && git push --tags'
alias gpt='git push --tags' #alias gpt='git push --tags'
alias gpc='git push --set-upstream origin "$(git-branch-current 2> /dev/null)"' #alias gpc='git push --set-upstream origin "$(git-branch-current 2> /dev/null)"'
alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"' #alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"'
# Rebase (r) # Rebase (r)
alias gr='git rebase' #alias gr='git rebase'
alias gra='git rebase --abort' #alias gra='git rebase --abort'
alias grc='git rebase --continue' #alias grc='git rebase --continue'
alias gri='git rebase --interactive' #alias gri='git rebase --interactive'
alias grs='git rebase --skip' #alias grs='git rebase --skip'
# Remote (R) # Remote (R)
alias gR='git remote' #alias gR='git remote'
alias gRl='git remote --verbose' #alias gRl='git remote --verbose'
alias gRa='git remote add' #alias gRa='git remote add'
alias gRx='git remote rm' #alias gRx='git remote rm'
alias gRm='git remote rename' #alias gRm='git remote rename'
alias gRu='git remote update' #alias gRu='git remote update'
alias gRp='git remote prune' #alias gRp='git remote prune'
alias gRs='git remote show' #alias gRs='git remote show'
alias gRb='git-hub-browse' #alias gRb='git-hub-browse'
# Stash (s) # Stash (s)
alias gs='git stash' #alias gs='git stash'
alias gsa='git stash apply' #alias gsa='git stash apply'
alias gsx='git stash drop' #alias gsx='git stash drop'
alias gsX='git-stash-clear-interactive' #alias gsX='git-stash-clear-interactive'
alias gsl='git stash list' #alias gsl='git stash list'
alias gsL='git-stash-dropped' #alias gsL='git-stash-dropped'
alias gsd='git stash show --patch --stat' #alias gsd='git stash show --patch --stat'
alias gsp='git stash pop' #alias gsp='git stash pop'
alias gsr='git-stash-recover' #alias gsr='git-stash-recover'
alias gss='git stash save --include-untracked' #alias gss='git stash save --include-untracked'
alias gsS='git stash save --patch --no-keep-index' #alias gsS='git stash save --patch --no-keep-index'
alias gsw='git stash save --include-untracked --keep-index' #alias gsw='git stash save --include-untracked --keep-index'
# Submodule (S) # Submodule (S)
alias gS='git submodule' #alias gS='git submodule'
alias gSa='git submodule add' #alias gSa='git submodule add'
alias gSf='git submodule foreach' #alias gSf='git submodule foreach'
alias gSi='git submodule init' #alias gSi='git submodule init'
alias gSI='git submodule update --init --recursive' #alias gSI='git submodule update --init --recursive'
alias gSl='git submodule status' #alias gSl='git submodule status'
alias gSm='git-submodule-move' #alias gSm='git-submodule-move'
alias gSs='git submodule sync' #alias gSs='git submodule sync'
alias gSu='git submodule foreach git pull origin master' #alias gSu='git submodule foreach git pull origin master'
alias gSx='git-submodule-remove' #alias gSx='git-submodule-remove'
# Working Copy (w) # Working Copy (w)
alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short' #alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}' #alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'
alias gwd='git diff --no-ext-diff' #alias gwd='git diff --no-ext-diff'
alias gwD='git diff --no-ext-diff --word-diff' #alias gwD='git diff --no-ext-diff --word-diff'
alias gwr='git reset --soft' #alias gwr='git reset --soft'
alias gwR='git reset --hard' #alias gwR='git reset --hard'
alias gwc='git clean -n' #alias gwc='git clean -n'
alias gwC='git clean -f' #alias gwC='git clean -f'
alias gwx='git rm -r' #alias gwx='git rm -r'
alias gwX='git rm -rf' #alias gwX='git rm -rf'

@ -11,3 +11,21 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
fi fi
# Customize to your needs... # Customize to your needs...
alias c='clear'
alias lsa='ls -a'
alias v='vim'
#RaspberryPi
export RPI=10.1.1.202
# Git
alias g='git'
alias gb='git branch -v'
alias gco='git checkout'
alias gst='git status'
# URBN
export MISL_LOCAL_DEV='http://localhost:8800'
alias MobileServices='cd ~/URBNLocal/source/MobileServices'
alias MISLWebUI='cd ~/URBNLocal/source/MISLWebUI'

Loading…
Cancel
Save