X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=e9374d83c1f0e5aa94d9a93d54a9d117a140adad;hb=6bf46a8c8b9fdcc6162f904d3f318e3500212686;hp=38d9c5c93eaa567bf3ea74cc6c00ac4c8b98e073;hpb=6c33565fed35bc03f7a61fd7ecb41558cc59a988;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 38d9c5c..e9374d8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,12 @@
 [alias]
+	alias = "!f() { [ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && return 0 || echo \"Usage: git alias <new alias> <original command>\" >&2 && return 1; }; f"
+	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
 	b = branch
 	branches = branch -a
+	cat = cat-file -p
+	dump = cat-file -p
+	file = cat-file -t
+	type = cat-file -t
 	camend = commit --amend -C HEAD
 	checkin = commit
 	ci = commit
@@ -19,9 +25,9 @@
 	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
+	ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}; }; f"
 	#root = !pwd
+	root = rev-parse --show-toplevel
 	st = status --short
 	stb = status --short --branch
 	tags = tag -l