X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=3ec2ca05f54a90d0bb9b19030895b8c06467c29b;hb=5623dbd17dda9363bf205e7772ef1d6fe7895074;hp=598af7be712d6828a716ab612e6cf2cf2c106bdd;hpb=fdbdf000588058f845f8a9edbe5ec3157189f680;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 598af7b..3ec2ca0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,6 @@
 [alias]
 	b = branch
+	branches = branch -a
 	camend = commit --amend -C HEAD
 	checkin = commit
 	ci = commit
@@ -16,10 +17,14 @@
 	lr = log --decorate --reverse
 	lr1 = log --decorate --reverse --oneline
 	lr5 = log --decorate --reverse -5
-	root = rev-parse --show-toplevel
+	null-merge = merge --strategy=ours
+	remotes = remote -v
+	ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}' -"
 	#root = !pwd
+	root = rev-parse --show-toplevel
 	st = status --short
 	stb = status --short --branch
+	tags = tag -l
 	unstage = reset HEAD --
 	wdiff = diff --word-diff
 	wshow = show --word-diff --decorate