.gitconfig: Add ff and git aliases

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 74673ebc1a69274ad78e0ebb1ec5a508f9675d03..f5605cf6e2a23511df7f38b87b24a51fb3a154f9 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -95,7 +95,7 @@
 
   ssb = status --short --branch
 
-  aliases = "!git config --get-regexp '^alias\\.' | colrm 1 6 | sed 's/ / = /'"
+  aliases = "!git config --get-regexp '^alias\\.' | cut -c7- | 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 = "!exec git add-alias --global"
@@ -144,9 +144,12 @@
        checkin = commit
        ci = commit
        cat = cat-file -p
+       dir = rev-parse --git-dir
        dump = cat-file -p
        file = cat-file -t
        type = cat-file -t
+       ff = merge --ff-only
+       git = !git
        l1 = log --decorate --oneline
        l5 = log --decorate -5
        ld = log --decorate
@@ -193,6 +196,7 @@
 
 [push]
        default = simple
+       followTags = true
 
 [receive]
        denyNonFastForwards = true
@@ -206,3 +210,17 @@
 [gui]
        fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
        fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
+
+# Github URL shortcuts
+[url "git@github.com:"]
+       insteadOf = "gh:"
+       pushInsteadOf = "github:"
+       pushInsteadOf = "git://github.com/"
+[url "git://github.com/"]
+       insteadOf = "github:"
+[url "git@gist.github.com:"]
+       insteadOf = "gst:"
+       pushInsteadOf = "gist:"
+       pushInsteadOf = "git://gist.github.com/"
+[url "git://gist.github.com/"]
+       insteadOf = "gist:"