From: Oleg Broytman <phd@phdru.name>
Date: Tue, 23 Feb 2016 23:03:43 +0000 (+0300)
Subject: .gitconfig: add aliases
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6c33565fed35bc03f7a61fd7ecb41558cc59a988;p=dotfiles.git

.gitconfig: add aliases

branches, null-merge, remotes, ri, tags
---

diff --git a/.gitconfig b/.gitconfig
index 598af7b..38d9c5c 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
+	null-merge = merge --strategy=ours
+	remotes = remote -v
+	ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u}\"}' -"
 	root = rev-parse --show-toplevel
 	#root = !pwd
 	st = status --short
 	stb = status --short --branch
+	tags = tag -l
 	unstage = reset HEAD --
 	wdiff = diff --word-diff
 	wshow = show --word-diff --decorate