From dadfaf119529b38457aaf96de3eeadcab2b24b95 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Thu, 17 Nov 2022 10:44:13 -0800 Subject: feat(wpcarro/fish): Support more aliases `git` and `terraform` things Change-Id: Iadbab94b4865591ad6abe282c5409dec01b5a62a Reviewed-on: https://cl.tvl.fyi/c/depot/+/7303 Reviewed-by: wpcarro Autosubmit: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/dotfiles/config.fish | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'users') diff --git a/users/wpcarro/dotfiles/config.fish b/users/wpcarro/dotfiles/config.fish index c71d4c028e..3be8fefd9c 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" -- cgit 1.4.1