summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-01-04 00:33:50 -0500
committerJune McEnroe <june@causal.agency>2020-01-04 00:33:50 -0500
commit5791899130d8baaaa117b0edf0e1a3e3f38e1bdc (patch)
tree72d277f91e91be4143424ec6e876367bd26c6b68
parentRemove shotty -c flag from up (diff)
downloadsrc-5791899130d8baaaa117b0edf0e1a3e3f38e1bdc.tar.gz
src-5791899130d8baaaa117b0edf0e1a3e3f38e1bdc.zip
Replace gr alias with git reset
I haven't been doing much rebasing in a long time and I've caught myself
trying to use gr to do reset.
Diffstat (limited to '')
-rw-r--r--home/.shrc3
1 files changed, 1 insertions, 2 deletions
diff --git a/home/.shrc b/home/.shrc
index b864018b..26184376 100644
--- a/home/.shrc
+++ b/home/.shrc
@@ -10,10 +10,9 @@ alias bc='bc -l'
 alias gs='git status --short --branch || ls' gd='git diff'
 alias gsh='git show' gl='git log --graph --pretty=log'
 alias gco='git checkout' gb='git branch' gm='git merge' gst='git stash'
-alias ga='git add' gmv='git mv' grm='git rm'
+alias ga='git add' gr='git reset' gmv='git mv' grm='git rm'
 alias gc='git commit' gca='gc --amend' gt='git tag'
 alias gp='git push' gu='git pull' gf='git fetch'
-alias gr='git rebase' gra='gr --abort' grc='gr --continue' grs='gr --skip'
 alias rand='openssl rand -base64 33'
 alias private='eval "$(gpg -d ~/.private)"'
 bman() { ssh ${freebsd:-monday} man "$@" | sh -c "$MANPAGER"; }