diff --git a/git/git.zsh b/git/git.zsh index 5096394..1a86fd8 100644 --- a/git/git.zsh +++ b/git/git.zsh @@ -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 } diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index 04d26a8..7fe5b53 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -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' diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 759074c..60b8e70 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -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 gb :Gblame -nmap gw :Gwrite -nmap gr :Gread -nmap gc :Gcommit -nmap gbr :Gbrowse -nmap gd :Gdiff - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Local vimrc """"""""""""""""""""""""""""""""""""""""""""""""""""""""""" diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index d030fe6..ccd52e0 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -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 }