From: Oleg Broytman <phd@phdru.name>
Date: Sun, 3 Jul 2016 18:56:11 +0000 (+0300)
Subject: .gitconfig: update some aliases from gitalias
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=e6013412d426c555aed45cf253da8d872aee47b5;p=dotfiles.git

.gitconfig: update some aliases from gitalias
---

diff --git a/.gitconfig b/.gitconfig
index 5f69a00..5651513 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -76,6 +76,12 @@
 
   rp = remote prune
 
+  incoming = !git remote update --prune; git log ..@{upstream}
+  outgoing = log @{upstream}..
+
+  # Push to all remotes
+  push-to-all-remotes = !git remote | xargs -I% -n1 git push %
+
   ### show-branch ###
 
   # show-branch - print a list of branches and their commits.
@@ -89,6 +95,10 @@
 
   aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"
 
+  add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git add-(local|global)-alias <new alias> <original command>\" >&2 && return 1; }; f"
+  add-global-alias = "!git add-alias --global"
+  add-local-alias = "!git add-alias --local"
+
   tags = tag -n1 -l
 
   # Find text in any commit ever
@@ -102,11 +112,6 @@
   # Get the current branch name
   branch-name = rev-parse --abbrev-ref HEAD
 
-	add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git [local-]alias <new alias> <original command>\" >&2 && return 1; }; f"
-	alias = "!git add-alias --global"
-	alias-local = "!git add-alias --local"
-	local-alias = "!git add-alias --local"
-	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
 	branches = branch --all
 	ca = commit --all
 	cv = commit --verbose
@@ -117,7 +122,6 @@
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
-	incoming = !git remote update --prune; git log ..@{upstream}
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
 	ld = log --decorate
@@ -128,8 +132,6 @@
 	lr1 = log --decorate --reverse --oneline
 	lr5 = log --decorate --reverse -5
 	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 ''