about summary refs log tree commit diff
path: root/users/wpcarro/dotfiles/config.fish
diff options
context:
space:
mode:
Diffstat (limited to 'users/wpcarro/dotfiles/config.fish')
-rw-r--r--users/wpcarro/dotfiles/config.fish15
1 files changed, 12 insertions, 3 deletions
diff --git a/users/wpcarro/dotfiles/config.fish b/users/wpcarro/dotfiles/config.fish
index 7a73208a30..3be8fefd9c 100644
--- a/users/wpcarro/dotfiles/config.fish
+++ b/users/wpcarro/dotfiles/config.fish
@@ -8,17 +8,26 @@ alias ls 'exa --sort=type'
 alias ll 'exa --long --sort=type'
 alias la 'exa --long --all --sort=type'
 alias gcan 'git commit --amend --no-edit'
+alias gco 'git checkout'
 alias gd 'git diff'
 alias gds 'git diff --staged'
 alias glp 'git log --pretty --oneline --graph'
-alias gpf 'git push --force-with-lease'
+alias gpf 'git push --force'
 alias gsh 'git show HEAD'
 alias gst 'git status'
+alias gprom 'git pull --rebase origin main'
+alias gfom 'git fetch origin main'
+alias grh 'git reset --hard'
+alias gproc 'git pull --rebase origin canon'
 alias edit 'emacsclient -n'
-# fs navigation
+alias h 'cd /hadrian'
 alias d 'cd /depot'
-alias w 'cd /depot/users/wpcarro'
+alias hw 'cd /hadrian/users/wpcarro'
+alias dw 'cd /depot/users/wpcarro'
 alias sc 'systemctl'
+alias ef 'edit ~/.config/fish/config.fish'
+alias sf 'source ~/.config/fish/config.fish'
+alias tf 'terraform'
 
 # environment variables
 set -gx EDITOR "emacsclient"