From 963bb771fcc48717e7e46213e8b531f46fd0a3d7 Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Sun, 26 Jun 2016 00:13:42 +0300
Subject: [PATCH] .gitconfig: update aliases

---
 .gitconfig | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index ff92fb0..5f69a00 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -107,23 +107,20 @@
 	alias-local = "!git add-alias --local"
 	local-alias = "!git add-alias --local"
 	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
-	b = branch
 	branches = branch --all
+	ca = commit --all
+	cv = commit --verbose
+	cav = commit --all --verbose
+	cane = commit --amend --no-edit
+	checkin = commit
 	cat = cat-file -p
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
-	camend = commit --amend --no-edit
-	checkin = commit
-	ci = commit
-	co = checkout
-	d = diff
-	dc = diff --cached
-	dshow = show --decorate
 	incoming = !git remote update --prune; git log ..@{upstream}
-	l = log --decorate
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
+	ld = log --decorate
 	lg = log --decorate --graph
 	lg1 = log --decorate --graph --oneline
 	lg5 = log --decorate --graph -5
@@ -133,16 +130,19 @@
 	null-merge = merge --strategy=ours
 	outgoing = log @{upstream}..
 	push2all = !git remote | xargs -I% -n1 git push %
+	rbi123 = "!f() { git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+	rbi = !git rbi123 '' ''
+	rbia = !git rbi123 --autosquash ''
+	rbiap = !git rbi123 --autosquash --preserve-merges
+	rbip = !git rbi123 '' --preserve-merges
 	remotes = remote -v
-	ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
 	#root = !pwd
 	root = rev-parse --show-toplevel
 	st = status --short
 	stb = status --short --branch
-	tags = tag --list
+	sd = show --decorate
+	sw = show --word-diff --decorate
 	unstage = reset HEAD --
-	wdiff = diff --word-diff
-	wshow = show --word-diff --decorate
 
 [branch]
 	autosetuprebase = always
-- 
2.39.2