From d12fc485b3dcb9216584d502ac3cab81fee37960 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 10 Mar 2021 13:33:42 +0100
Subject: Order aliases alphabetically, add pushf and ri

Taken from https://www.linux-magazin.de/ausgaben/2019/04/tipps-und-tricks-2/
---
 .gitconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 086ca86..901dfc8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,18 +22,20 @@
 	ll = log --decorate --graph --pretty=oneline
 	lp = log -p
 	ls = ls-files
+	pr = "!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+	pushf = push --force-with-lease
+	ri = rebase --interactive --autosquash
 	s = status -s
 	st = status
+	today = commit --amend --date=now --no-edit
 	up = pull --rebase --autostash --prune origin master
 	cr = codereview
 	change = codereview change
 	gofmt = codereview gofmt
 	mail = codereview mail -trust
 	pending = codereview pending
-	pr = "!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
 	submit = codereview submit
 	sync = codereview sync
-	today = commit --amend --date=now --no-edit
 
 [pretty]
 	fixes = Fixes: %h (\"%s\")
-- 
cgit v1.2.3-54-g00ecf