.gitconfig: update some aliases from gitalias

diff --git a/.gitconfig b/.gitconfig
index 5f69a00a4645c172a6d7b5404a98d6c3c05a182f..5651513f2da77563b615ec9a2b215bc13231344c 100644 (file)
--- 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 ''