about summary refs log tree commit diff
path: root/users/wpcarro/dotfiles
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2022-11-17T18·44-0800
committerclbot <clbot@tvl.fyi>2022-11-17T18·47+0000
commitdadfaf119529b38457aaf96de3eeadcab2b24b95 (patch)
tree07ca847e506a215d2609fe6ab44fd45f01c8649c /users/wpcarro/dotfiles
parent2a4768d49796911836b15e937249c33ee73e6cc4 (diff)
feat(wpcarro/fish): Support more aliases r/5285
`git` and `terraform` things

Change-Id: Iadbab94b4865591ad6abe282c5409dec01b5a62a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7303
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/wpcarro/dotfiles')
-rw-r--r--users/wpcarro/dotfiles/config.fish6
1 files changed, 4 insertions, 2 deletions
diff --git a/users/wpcarro/dotfiles/config.fish b/users/wpcarro/dotfiles/config.fish
index c71d4c028e61..3be8fefd9c1e 100644
--- a/users/wpcarro/dotfiles/config.fish
+++ b/users/wpcarro/dotfiles/config.fish
@@ -12,13 +12,14 @@ 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 hw 'cd /hadrian/users/wpcarro'
@@ -26,6 +27,7 @@ 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"