xdg: add user-dirs.dirs

[dotfiles.git] / zsh / aliases / git.zsh

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index 87a708c4db3b285f36035fcae61e6fc1b7dad6a3..dbf552e35f28a1afc82cfef103f420d03d011019 100644 (file)
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -8,6 +8,7 @@ alias gl='git pull'
 alias gup='git pull --rebase'
 
 alias gp='git push'
+alias gpf='git push --force-with-lease'
 
 alias gd='git diff'
 alias gdc='git diff --cached'
@@ -18,6 +19,7 @@ alias gc='git commit -v'
 alias gcs='git commit -v --squash'
 alias gcf='git commit -v --fixup'
 alias gca='git commit -v -a'
+alias gcaf='git commit -v -a --fixup'
 
 alias gco='git checkout'
 alias gcm='git checkout master'
@@ -68,7 +70,7 @@ alias gpoat='git push origin --all && git push origin --tags'
 
 # cd into the top of the current repository
 # or submodule.
-alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
+alias cdr='cd $(git rev-parse --show-toplevel || echo ".")'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'