Updating git aliases, removing fugitive shortcuts
Also updating prompt symbols
This commit is contained in:
@@ -17,13 +17,13 @@ alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C
|
||||
alias git-amend='git commit --amend -C HEAD'
|
||||
alias git-undo='git reset --soft HEAD~1'
|
||||
alias git-count='git shortlog -sn'
|
||||
alias undopush="git push -f origin HEAD^:master"
|
||||
alias git-undopush="git push -f origin HEAD^:master"
|
||||
# git root
|
||||
alias gr='[ ! -z `git rev-parse --show-cdup` ] && cd `git rev-parse --show-cdup || pwd`'
|
||||
|
||||
alias sub-pull='git submodule foreach git pull origin master'
|
||||
|
||||
funciton give-credit() {
|
||||
function give-credit() {
|
||||
git commit --amend --author $1 <$2> -C HEAD
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,12 @@
|
||||
si = submodule init
|
||||
su = submodule update
|
||||
|
||||
# show number of commits per contributer, sorted
|
||||
count = shortlog -sn
|
||||
|
||||
undo = reset --soft HEAD~1
|
||||
amend = git commit --amend -C HEAD
|
||||
|
||||
# grep commands
|
||||
|
||||
# 'diff grep'
|
||||
|
||||
@@ -296,14 +296,6 @@ let g:ctrlp_custom_ignore = {
|
||||
" search the nearest ancestor that contains .git, .hg, .svn
|
||||
let g:ctrlp_working_path_mode = 2
|
||||
|
||||
" vim-fugitive mappings
|
||||
nmap <leader>gb :Gblame<cr>
|
||||
nmap <leader>gw :Gwrite<cr>
|
||||
nmap <leader>gr :Gread<cr>
|
||||
nmap <leader>gc :Gcommit<cr>
|
||||
nmap <leader>gbr :Gbrowse<cr>
|
||||
nmap <leader>gd :Gdiff<cr>
|
||||
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" => Local vimrc
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
|
||||
@@ -12,9 +12,9 @@ git_dirty() {
|
||||
else
|
||||
if [[ $st == "nothing to commit (working directory clean)" ]]
|
||||
then
|
||||
echo "%{$fg_bold[green]%}☺ $(git_prompt_info)%{$reset_color%}"
|
||||
echo "%{$fg_bold[green]%}✔ $(git_prompt_info)%{$reset_color%}"
|
||||
else
|
||||
echo "%{$fg_bold[red]%}☠ $(git_prompt_info)%{$reset_color%}"
|
||||
echo "%{$fg_bold[red]%}✗ $(git_prompt_info)%{$reset_color%}"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user