X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=09b3a590259efb0f9fb5f961d50edc32fcf70985;hb=eccf47f27c1f0bb6d031f5320ae6bef6a1d8076f;hp=598af7be712d6828a716ab612e6cf2cf2c106bdd;hpb=fdbdf000588058f845f8a9edbe5ec3157189f680;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 598af7b..09b3a59 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,13 @@
 [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
-	camend = commit --amend -C HEAD
+	branches = branch --all
+	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
@@ -16,10 +23,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 = "!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 --list
 	unstage = reset HEAD --
 	wdiff = diff --word-diff
 	wshow = show --word-diff --decorate