From b9608fa9ab43bf73584e2a9a6a5e1d6653202187 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Sun, 11 Dec 2022 00:08:22 +0100
Subject: Add a few useful git aliases

---
 zshrc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'zshrc')

diff --git a/zshrc b/zshrc
index b87e91e4..49804126 100644
--- a/zshrc
+++ b/zshrc
@@ -100,19 +100,26 @@ alias diff='\diff -s --color=auto'
 alias cdiff='\diff -s --color=always'
 alias ipy='ipython3 --autoindent --automagic --pprint --no-banner --no-confirm-exit --term-title --autocall=1 --colors=Neutral'
 alias rot13='caesar 13'
+alias wget='\wget --hsts-file="${XDG_CACHE_HOME:-$HOME/.cache}/wget-hsts"'
+alias aurora="REQUESTS_CA_BUNDLE=${XDG_CONFIG_HOME:-$HOME/.config}/cern-ca-bundle.crt \aurora"
+alias aurora_admin="REQUESTS_CA_BUNDLE=${XDG_CONFIG_HOME:-$HOME/.config}/cern-ca-bundle.crt \aurora_admin"
+
+# Git aliases
 alias ga='git add'
 alias gb='git branch'
 alias gc='git commit'
 alias gd='git diff'
+alias gds='git diff --staged'
 alias gf='git fetch'
+alias gfa='git fetch --all --prune --tags'
 alias gk='git checkout'
+alias gkb='git checkout -b'
 alias gg='git glog'
 alias gl='git pull'
 alias gp='git push'
+alias gr='git rebase'
+alias gri='git rebase --interactive'
 alias gs='git status'
-alias wget='\wget --hsts-file="${XDG_CACHE_HOME:-$HOME/.cache}/wget-hsts"'
-alias aurora="REQUESTS_CA_BUNDLE=${XDG_CONFIG_HOME:-$HOME/.config}/cern-ca-bundle.crt \aurora"
-alias aurora_admin="REQUESTS_CA_BUNDLE=${XDG_CONFIG_HOME:-$HOME/.config}/cern-ca-bundle.crt \aurora_admin"
 
 if recsel --version 2>/dev/null | grep -qFx 'recsel (GNU recutils) 1.8'; then
   # Recutils 1.8 has a bug when TMPDIR is on a different mount point, see
-- 
cgit v1.2.3