diff --git a/dot_files/gitconfig b/dot_files/gitconfig index 63c7a7106..7462bf3e2 100644 --- a/dot_files/gitconfig +++ b/dot_files/gitconfig @@ -9,27 +9,27 @@ br = branch co = checkout df = diff - lg = log -p lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative loo = log --pretty=oneline --abbrev-commit lol = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit lola = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all - rewrite-history = rebase -i HEAD~2 - rewrite-history1 = rebase -i HEAD~ - rewrite-history2 = rebase -i HEAD~2 - rewrite-history3 = rebase -i HEAD~3 - rewrite-history4 = rebase -i HEAD~4 - rewrite-history5 = rebase -i HEAD~5 - rewrite-history6 = rebase -i HEAD~6 - rewrite-history7 = rebase -i HEAD~7 - rewrite-history8 = rebase -i HEAD~8 - rewrite-history9 = rebase -i HEAD~9 + rewrite-history = rebase -i HEAD~2 + rewrite-history1 = rebase -i HEAD~ + rewrite-history2 = rebase -i HEAD~2 + rewrite-history3 = rebase -i HEAD~3 + rewrite-history4 = rebase -i HEAD~4 + rewrite-history5 = rebase -i HEAD~5 + rewrite-history6 = rebase -i HEAD~6 + rewrite-history7 = rebase -i HEAD~7 + rewrite-history8 = rebase -i HEAD~8 + rewrite-history9 = rebase -i HEAD~9 rewrite-history10 = rebase -i HEAD~10 tags = tag -l branches = branch -a remotes = remote -v sync = fetch --all + root = rev-parse --show-toplevel # This only works if git > 0.7.10 # # [include] diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 1285a3247..3fd475350 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -72,7 +72,7 @@ alias gm='git merge' compdef _git gm=git-merge alias grh='git reset HEAD' alias grhh='git reset HEAD --hard' -alias gclean='git reset --hard && git clean -dfx' +alias gclean='(cd $(git rev-parse --show-toplevel) && git reset --hard && git clean -dfx)' alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' #remove the gf alias @@ -156,5 +156,5 @@ alias gunignore='git update-index --no-assume-unchanged' # list temporarily ignored files alias gignored='git ls-files -v | grep "^[[:lower:]]"' - +alias tiga='tig --all' diff --git a/plugins/git2/git2.plugin.zsh b/plugins/git2/git2.plugin.zsh index d4ebf2d73..b1d9a171c 100644 --- a/plugins/git2/git2.plugin.zsh +++ b/plugins/git2/git2.plugin.zsh @@ -253,7 +253,8 @@ compdef _git gke='gitk' # Clean # Remove all .orig, .BASE.*, .REMOTE.*, .LOCAL.*, *.BACKUP files -alias gclean=" find . -name '*.orig' -or -name '*.REMOTE.*' -or -name '*.LOCAL.*' -or -name '*.BACKUP.*' -or -name '*.BASE.*' | xargs -r rm -v" +alias gclean="find $(git rev-parse --show-toplevel) -name '*.orig' -or -name '*.REMOTE.*' -or -name '*.LOCAL.*' -or -name '*.BACKUP.*' -or -name '*.BASE.*' | xargs -r rm -v" +alias gcleanreset='(cd $(git rev-parse --show-toplevel) && git reset --hard && git clean -dfx)' # Edit global Git configuration files alias gitconfig="vim ~/.gitconfig"