summary refs log tree commit diff
path: root/home
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-10-27 13:04:29 -0400
committerJune McEnroe <june@causal.agency>2020-10-27 13:04:29 -0400
commitdfcb55b3c428fdda52ed9a0a0af4583872cffc1b (patch)
treedd0e5d61cffb77a94acdb290dc65318e85bbbd2a /home
parentAllow cd host: to cd to same path over ssh (diff)
downloadsrc-dfcb55b3c428fdda52ed9a0a0af4583872cffc1b.tar.gz
src-dfcb55b3c428fdda52ed9a0a0af4583872cffc1b.zip
Switch gr alias back to git rebase
I always type out git reset and sometimes still expect gr to be
rebase... Never got used to it I guess.
Diffstat (limited to '')
-rw-r--r--home/.shrc4
1 files changed, 2 insertions, 2 deletions
diff --git a/home/.shrc b/home/.shrc
index 3013ac79..78d9e9f3 100644
--- a/home/.shrc
+++ b/home/.shrc
@@ -10,9 +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' gr='git reset' gmv='git mv' grm='git rm'
+alias ga='git add' 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 gp='git push' gu='git pull' gf='git fetch' gr='git rebase'
 alias rand='openssl rand -base64 33'
 alias private='eval "$(gpg -d ~/.private)"'
 type doas >/dev/null 2>&1 && alias sudo=doas
r class='nohover-highlight'> 2019-07-27Rewrite Makefile once more with more organizationJune McEnroe 2019-07-27Reference png.h in bin.7June McEnroe 2019-07-27Revert "Use scheme to style HTMLs"June McEnroe This reverts commit 46237a457ff3c9a813a56f2a442c115bf8610cbc. I don't know why but I don't like it. 2019-07-27Remove scheme text linkJune McEnroe No standard base64 encoder so no way to maintain it. 2019-07-26Update Dark.terminalJune McEnroe Why are the blobs so much bigger now? 2019-07-26Lighten dark whiteJune McEnroe 2019-07-25Add png.3 man pageJune McEnroe 2019-07-25Use scheme to style HTMLsJune McEnroe 2019-07-25Don't match comments in strings in makeJune McEnroe 2019-07-25Generate index.html with links from bin.7June McEnroe 2019-07-24Warn when date has changedJune McEnroe 2019-07-24Add whenJune McEnroe When? Now. 2019-07-24Remove histedit from bitJune McEnroe